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.

Sign up for GitHub

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

(C++) adding missing include to be fully compatible with C++13 #2663

Merged
merged 5 commits into from
Oct 12, 2024
Merged

(C++) adding missing include to be fully compatible with C++13 #2663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9f253d
(C++) adding missing include to be fully compatible with C++13
cvvergara Oct 12, 2024
598ec24
fix clang-tidy error
cvvergara Oct 12, 2024
e97828a
(docqueries/stoerWagner) updating results to boost used in CI
cvvergara Oct 12, 2024
76b7671
(C++) fix guard to new name
cvvergara Oct 12, 2024
22125db
(doc) documenting changes
cvvergara Oct 12, 2024
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ milestone for 3.6.3
* postgres 11.0.0
* postgis 3.0.0

* g++ 13+ is supported

**Code fixes**

* Fix warnings from cpplint.
Expand Down
2 changes: 2 additions & 0 deletions doc/src/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ milestone for 3.6.3
* postgres 11.0.0
* postgis 3.0.0

* g++ 13+ is supported

.. rubric:: Code fixes

* Fix warnings from cpplint.
Expand Down
2 changes: 1 addition & 1 deletion docqueries/mincut/doc-stoerWagner.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SELECT * FROM pgr_stoerWagner(
FROM edges WHERE id < 17');
seq | edge | cost | mincut
-----+------+------+--------
1 | 6 | 1 | 1
1 | 14 | 1 | 1
(1 row)

/* -- q2 */
Expand Down
2 changes: 1 addition & 1 deletion include/cpp_common/basePath_SSEC.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "c_types/mst_rt.h"
#include "cpp_common/path_t.h"
#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"

namespace pgrouting {

Expand Down
9 changes: 5 additions & 4 deletions include/cpp_common/rule.h → include/cpp_common/rule.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*PGR-GNU*****************************************************************

FILE: rule.h
FILE: rule.hpp

Copyright (c) 2017 pgRouting developers
Mail: [email protected]
Expand All @@ -23,12 +23,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

********************************************************************PGR-GNU*/

#ifndef INCLUDE_CPP_COMMON_RULE_H_
#define INCLUDE_CPP_COMMON_RULE_H_
#ifndef INCLUDE_CPP_COMMON_RULE_HPP_
#define INCLUDE_CPP_COMMON_RULE_HPP_


#include <vector>
#include <sstream>
#include <cstdint>

typedef struct Restriction_t Restriction_t;

Expand Down Expand Up @@ -76,4 +77,4 @@ class Rule {
} // namespace trsp
} // namespace pgrouting

#endif // INCLUDE_CPP_COMMON_RULE_H_
#endif // INCLUDE_CPP_COMMON_RULE_HPP_
2 changes: 1 addition & 1 deletion include/trsp/pgr_trspHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include "cpp_common/basePath_SSEC.hpp"
#include "trsp/edgeInfo.h"
#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"
#include "cpp_common/pgr_messages.h"

namespace pgrouting {
Expand Down
2 changes: 1 addition & 1 deletion include/yen/pgr_turnRestrictedPath.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "cpp_common/basePath_SSEC.hpp"
#include "cpp_common/compPaths.h"
#include "cpp_common/pgr_messages.h"
#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"

namespace pgrouting {
namespace yen {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp_common/rule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

********************************************************************PGR-GNU*/

#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"

#include <vector>
#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion src/ksp/turnRestrictedPath_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "cpp_common/pgr_alloc.hpp"
#include "cpp_common/pgr_assert.h"

#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"

#include "cpp_common/basePath_SSEC.hpp"
#include "c_types/restriction_t.h"
Expand Down
2 changes: 1 addition & 1 deletion src/trsp/trspVia_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "dijkstra/pgr_dijkstraVia.hpp"
#include "c_types/routes_t.h"
#include "c_types/restriction_t.h"
#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"
#include "cpp_common/combinations.h"
#include "cpp_common/pgr_alloc.hpp"
#include "cpp_common/pgr_assert.h"
Expand Down
2 changes: 1 addition & 1 deletion src/trsp/trspVia_withPoints_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "withPoints/pgr_withPoints.hpp"
#include "c_types/routes_t.h"
#include "c_types/restriction_t.h"
#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"
#include "cpp_common/combinations.h"
#include "cpp_common/pgr_alloc.hpp"
#include "cpp_common/pgr_assert.h"
Expand Down
2 changes: 1 addition & 1 deletion src/trsp/trsp_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <cassert>

#include "trsp/pgr_trspHandler.h"
#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"
#include "cpp_common/pgr_assert.h"
#include "cpp_common/pgr_alloc.hpp"
#include "cpp_common/combinations.h"
Expand Down
2 changes: 1 addition & 1 deletion src/trsp/trsp_withPoints_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <map>

#include "trsp/pgr_trspHandler.h"
#include "cpp_common/rule.h"
#include "cpp_common/rule.hpp"
#include "cpp_common/pgr_assert.h"
#include "cpp_common/pgr_alloc.hpp"
#include "cpp_common/combinations.h"
Expand Down
Loading