Fix #2707 include cstdint

- (C++) Adding include cstdint - (C++) fixing warning -Wtemplate-id-cdtor - Update NEWS & release_notes
pgRouting · Jan 7, 2025 · 4736534 · 4736534
1 parent ae34f13
commit 4736534
Show file tree

Hide file tree

Showing 64 changed files with 94 additions and 15 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -10,8 +10,14 @@
 
 ### pgRouting 3.7.2 Release Notes
 
+To see all issues & pull requests closed by this release see the [Git closed
+milestone for 3.7.2
+](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.2%22)
+
 **Bug fixes**
 
+* [#2707](https://github.com/pgRouting/pgrouting/pull/2707) Build failure in
+  pgRouting 3.7.1 on Alpine
 * [#2706](https://github.com/pgRouting/pgrouting/pull/2706) winnie crashing
   on pgr_betweennessCentrality
 

diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst
@@ -41,8 +41,14 @@ pgRouting 3.7
 pgRouting 3.7.2 Release Notes
 -------------------------------------------------------------------------------
 
+To see all issues & pull requests closed by this release see the `Git closed
+milestone for 3.7.2
+<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.2%22>`__
+
 .. rubric:: Bug fixes
 
+* `#2707 <https://github.com/pgRouting/pgrouting/pull/2707>`__ Build failure in
+  pgRouting 3.7.1 on Alpine
 * `#2706 <https://github.com/pgRouting/pgrouting/pull/2706>`__ winnie crashing
   on pgr_betweennessCentrality
 

diff --git a/include/astar/astar.hpp b/include/astar/astar.hpp
@@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <limits>
 #include <set>
 #include <map>
+#include <cstdint>
 
 #include <boost/graph/astar_search.hpp>
 

diff --git a/include/bdAstar/bdAstar.hpp b/include/bdAstar/bdAstar.hpp
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <map>
 #include <set>
 #include <deque>
+#include <cstdint>
 
 #include "cpp_common/bidirectional.hpp"
 #include "cpp_common/basePath_SSEC.hpp"

diff --git a/include/bellman_ford/bellman_ford.hpp b/include/bellman_ford/bellman_ford.hpp
@@ -38,6 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <functional>
 #include <limits>
 #include <map>
+#include <cstdint>
+
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/bellman_ford_shortest_paths.hpp>

diff --git a/include/bellman_ford/edwardMoore.hpp b/include/bellman_ford/edwardMoore.hpp
@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <deque>
 #include <set>
 #include <map>
+#include <cstdint>
 
 #include "cpp_common/basePath_SSEC.hpp"
 #include "cpp_common/base_graph.hpp"

diff --git a/include/bgraph/graph_to_edges.hpp b/include/bgraph/graph_to_edges.hpp
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <vector>
 #include <map>
 #include <utility>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>

diff --git a/include/bgraph/line_graph.hpp b/include/bgraph/line_graph.hpp
@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_BGRAPH_LINE_GRAPH_HPP_
 
 #include <map>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>

diff --git a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp
@@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <vector>
 #include <set>
 #include <map>
+#include <cstdint>
 
 #include "cpp_common/basePath_SSEC.hpp"
 #include "cpp_common/base_graph.hpp"

diff --git a/include/breadthFirstSearch/breadthFirstSearch.hpp b/include/breadthFirstSearch/breadthFirstSearch.hpp
@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <vector>
 #include <set>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/breadth_first_search.hpp>

diff --git a/include/chinese/chinesePostman.hpp b/include/chinese/chinesePostman.hpp
@@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <set>
 #include <limits>
 #include <stack>
+#include <cstdint>
 
 #include "max_flow/minCostMaxFlow.hpp"
 #include "c_types/path_rt.h"

diff --git a/include/coloring/bipartite_driver.hpp b/include/coloring/bipartite_driver.hpp
@@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <iostream>
 #include <algorithm>
 #include <vector>
+#include <cstdint>
 
 #include <boost/property_map/property_map.hpp>
 #include <boost/property_map/vector_property_map.hpp>

diff --git a/include/coloring/edgeColoring.hpp b/include/coloring/edgeColoring.hpp
@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <iostream>
 #include <map>
 #include <vector>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>

diff --git a/include/coloring/sequentialVertexColoring.hpp b/include/coloring/sequentialVertexColoring.hpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <algorithm>
 #include <vector>
 #include <map>
+#include <cstdint>
 
 #include <boost/property_map/property_map.hpp>
 #include <boost/graph/graph_traits.hpp>

diff --git a/include/components/components.hpp b/include/components/components.hpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <map>
 #include <utility>
 #include <algorithm>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>

diff --git a/include/components/componentsResult.hpp b/include/components/componentsResult.hpp
@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma once
 
 #include <vector>
+#include <cstdint>
 
 #include "c_types/ii_t_rt.h"
 

diff --git a/include/components/makeConnected.hpp b/include/components/makeConnected.hpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <vector>
 #include <set>
 #include <map>
+#include <cstdint>
 
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/properties.hpp>

diff --git a/include/contraction/contract.hpp b/include/contraction/contract.hpp
@@ -33,13 +33,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <deque>
 #include <vector>
-#include "cpp_common/assert.hpp"
+#include <cstdint>
 
 #include "contraction/contractionGraph.hpp"
 #include "contraction/ch_graphs.hpp"
 #include "contraction/linearContraction.hpp"
 #include "contraction/deadEndContraction.hpp"
 
+#include "cpp_common/assert.hpp"
+
 namespace pgrouting {
 namespace contraction {
 

diff --git a/include/contraction/contractionGraph.hpp b/include/contraction/contractionGraph.hpp
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <vector>
 #include <iostream>
 #include <tuple>
+#include <cstdint>
 
 #include <boost/graph/iteration_macros.hpp>
 
@@ -58,7 +59,7 @@ class Pgr_contractionGraph : public Pgr_base_graph<G, CH_vertex, CH_edge, t_dire
      /*!
        Prepares the _graph_ to be of type *directed*
        */
-     explicit Pgr_contractionGraph<G, t_directed>()
+     explicit Pgr_contractionGraph()
          : Pgr_base_graph<G, CH_vertex, CH_edge, t_directed>() {
          }
 

diff --git a/include/contraction/linearContraction.hpp b/include/contraction/linearContraction.hpp
@@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <queue>
 #include <functional>
 #include <vector>
+#include <cstdint>
 
 #include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/filtered_graph.hpp>

diff --git a/include/cpp_common/basePath_SSEC.hpp b/include/cpp_common/basePath_SSEC.hpp
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <iostream>
 #include <algorithm>
 #include <map>
+#include <cstdint>
 
 #include "cpp_common/undefPostgresDefine.hpp"
 

diff --git a/include/cpp_common/base_graph.hpp b/include/cpp_common/base_graph.hpp
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <map>
 #include <limits>
 #include <string>
+#include <cstdint>
 
 #include <boost/graph/iteration_macros.hpp>
 #include <boost/config.hpp>
@@ -265,7 +266,7 @@ class Pgr_base_graph {
        - inserts the vertices
        - The vertices must be checked (if necessary)  before calling the constructor
        */
-     explicit Pgr_base_graph<G , T_V, T_E, t_directed>(
+     explicit Pgr_base_graph(
              const std::vector<T_V> &vertices)
          : graph(vertices.size()),
          m_is_directed(t_directed),
@@ -295,7 +296,7 @@ class Pgr_base_graph {
      /**
        Prepares the _graph_ to be of type gtype with 0 vertices
        */
-     explicit Pgr_base_graph<G , T_V, T_E, t_directed>()
+     explicit Pgr_base_graph()
          : graph(0),
          m_is_directed(t_directed),
          vertIndex(boost::get(boost::vertex_index, graph)),

diff --git a/include/cpp_common/basic_edge.hpp b/include/cpp_common/basic_edge.hpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_CPP_COMMON_BASIC_EDGE_HPP_
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace pgrouting {
 

diff --git a/include/cpp_common/basic_vertex.hpp b/include/cpp_common/basic_vertex.hpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <vector>
 #include <ostream>
+#include <cstdint>
 
 #include "cpp_common/edge_t.hpp"
 

diff --git a/include/cpp_common/bidirectional.hpp b/include/cpp_common/bidirectional.hpp
@@ -41,6 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <limits>
 #include <functional>
 #include <numeric>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>

diff --git a/include/cpp_common/ch_edge.hpp b/include/cpp_common/ch_edge.hpp
@@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <iostream>
 #include <sstream>
+#include <cstdint>
+
 #include "cpp_common/ch_vertex.hpp"
 
 namespace pgrouting {

diff --git a/include/cpp_common/ch_vertex.hpp b/include/cpp_common/ch_vertex.hpp
@@ -28,9 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 #ifndef INCLUDE_CPP_COMMON_CH_VERTEX_HPP_
 #define INCLUDE_CPP_COMMON_CH_VERTEX_HPP_
+
 #include <iostream>
 #include <sstream>
 #include <vector>
+#include <cstdint>
 
 #include "cpp_common/edge_t.hpp"
 #include "cpp_common/identifiers.hpp"

diff --git a/include/cpp_common/get_data.hpp b/include/cpp_common/get_data.hpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <vector>
 #include <string>
+#include <cstdint>
 
 #include "cpp_common/info_t.hpp"
 #include "cpp_common/get_check_data.hpp"

diff --git a/include/cpp_common/identifier.hpp b/include/cpp_common/identifier.hpp
@@ -31,10 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_CPP_COMMON_IDENTIFIER_HPP_
 #pragma once
 
-#if defined(__MINGW32__) || defined(_MSC_VER)
-#include <stdint.h>
-#endif
-
+#include <cstdint>
 #include <ostream>
 
 namespace pgrouting {

diff --git a/include/cpp_common/identifiers.hpp b/include/cpp_common/identifiers.hpp
@@ -54,15 +54,15 @@ class Identifiers {
 
     //! @name constructors
     //@{
-    Identifiers<T>() = default;
-    Identifiers<T>(const std::set<T>& data) : m_ids(data) {
+    Identifiers() = default;
+    explicit Identifiers(const std::set<T>& data) : m_ids(data) {
     }
 
     /* @brief initializes with {1 ~ number}
      *
      * @params [in] number
      */
-    explicit Identifiers<T>(const size_t number) {
+    explicit Identifiers(const size_t number) {
         size_t i(0);
         std::generate_n(std::inserter(m_ids, m_ids.begin()),
                 number,

diff --git a/include/cpp_common/line_vertex.hpp b/include/cpp_common/line_vertex.hpp
@@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <vector>
 #include <ostream>
+#include <cstdint>
 
 #include "cpp_common/edge_t.hpp"
 

diff --git a/include/cpp_common/path_t.hpp b/include/cpp_common/path_t.hpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_CPP_COMMON_PATH_T_HPP_
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 struct Path_t {
     int64_t node;

diff --git a/include/cpp_common/pgdata_fetchers.hpp b/include/cpp_common/pgdata_fetchers.hpp
@@ -45,6 +45,7 @@ extern "C" {
 }
 
 #include <vector>
+#include <cstdint>
 
 #include "cpp_common/undefPostgresDefine.hpp"
 

diff --git a/include/cpp_common/trsp_pgfetch.hpp b/include/cpp_common/trsp_pgfetch.hpp
@@ -57,6 +57,8 @@ extern "C" {
 }
 
 #include <vector>
+#include <cstdint>
+
 #include "cpp_common/undefPostgresDefine.hpp"
 
 using Edge_t = struct Edge_rt;

diff --git a/include/cpp_common/xy_vertex.hpp b/include/cpp_common/xy_vertex.hpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 #include <vector>
+#include <cstdint>
 
 #include "cpp_common/bpoint.hpp"
 #include "cpp_common/edge_xy_t.hpp"

diff --git a/include/dagShortestPath/dagShortestPath.hpp b/include/dagShortestPath/dagShortestPath.hpp
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <functional>
 #include <limits>
 #include <map>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>

diff --git a/include/dijkstra/dijkstra.hpp b/include/dijkstra/dijkstra.hpp
@@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <limits>
 #include <map>
 #include <numeric>
+#include <cstdint>
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>

diff --git a/include/dijkstra/dijkstraVia.hpp b/include/dijkstra/dijkstraVia.hpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <sstream>
 #include <deque>
 #include <vector>
+#include <cstdint>
 
 #include "dijkstra/dijkstra.hpp"
 

diff --git a/include/dijkstra/drivingDist.hpp b/include/dijkstra/drivingDist.hpp
@@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <limits>
 #include <map>
 #include <numeric>
+#include <cstdint>
 
 
 #include <boost/config.hpp>

diff --git a/include/dominator/lengauerTarjanDominatorTree_driver.hpp b/include/dominator/lengauerTarjanDominatorTree_driver.hpp
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <vector>
 #include <algorithm>
+#include <cstdint>
 
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/dominator_tree.hpp>
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,7 @@ extern "C" { @@
     }
     #include <vector>
+    #include <cstdint>
     #include "cpp_common/undefPostgresDefine.hpp"
@@ Expand Down @@