Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #2707 include cstdint #2712

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions include/astar/astar.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions include/bdAstar/bdAstar.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions include/bellman_ford/bellman_ford.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/bellman_ford/edwardMoore.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions include/bgraph/graph_to_edges.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/bgraph/line_graph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/breadthFirstSearch/binaryBreadthFirstSearch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions include/breadthFirstSearch/breadthFirstSearch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/chinese/chinesePostman.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions include/coloring/bipartite_driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/coloring/edgeColoring.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/coloring/sequentialVertexColoring.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/components/components.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/components/componentsResult.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions include/components/makeConnected.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion include/contraction/contract.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 2 additions & 1 deletion include/contraction/contractionGraph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>() {
}

Expand Down
1 change: 1 addition & 0 deletions include/contraction/linearContraction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/cpp_common/basePath_SSEC.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 3 additions & 2 deletions include/cpp_common/base_graph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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)),
Expand Down
2 changes: 1 addition & 1 deletion include/cpp_common/basic_edge.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
1 change: 1 addition & 0 deletions include/cpp_common/basic_vertex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions include/cpp_common/bidirectional.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions include/cpp_common/ch_edge.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions include/cpp_common/ch_vertex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions include/cpp_common/get_data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 1 addition & 4 deletions include/cpp_common/identifier.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions include/cpp_common/identifiers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions include/cpp_common/line_vertex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion include/cpp_common/path_t.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions include/cpp_common/pgdata_fetchers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ extern "C" {
}

#include <vector>
#include <cstdint>

#include "cpp_common/undefPostgresDefine.hpp"

Expand Down
2 changes: 2 additions & 0 deletions include/cpp_common/trsp_pgfetch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ extern "C" {
}

#include <vector>
#include <cstdint>

#include "cpp_common/undefPostgresDefine.hpp"

using Edge_t = struct Edge_rt;
Expand Down
1 change: 1 addition & 0 deletions include/cpp_common/xy_vertex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions include/dagShortestPath/dagShortestPath.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/dijkstra/dijkstra.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/dijkstra/dijkstraVia.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions include/dijkstra/drivingDist.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions include/dominator/lengauerTarjanDominatorTree_driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading
Loading