update boost geometry includes (valhalla#5117)

Georepublic · Feb 25, 2025 · 44dee56 · 44dee56
1 parent 46418a5
commit 44dee56
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
    * FIXED: Slim down Matrix PBF response [#5066](https://github.com/valhalla/valhalla/pull/5066)
    * FIXED: restore ignoring hierarchy limits for bicycle and pedestrian [#5080](https://github.com/valhalla/valhalla/pull/5080)
    * FIXED: GCC warning 'template-id not allowed for constructor in C++20' [#5110](https://github.com/valhalla/valhalla/pull/5110)
+   * FIXED: update deprecated boost geometry headers [#5117](https://github.com/valhalla/valhalla/pull/5117)
 * **Enhancement**
    * ADDED: Consider smoothness in all profiles that use surface [#4949](https://github.com/valhalla/valhalla/pull/4949)
    * ADDED: `admin_crossings` request parameter for `/route` [#4941](https://github.com/valhalla/valhalla/pull/4941)

diff --git a/src/mjolnir/graphenhancer.cc b/src/mjolnir/graphenhancer.cc
@@ -22,10 +22,10 @@
 #include <vector>
 
 #include <boost/format.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include "baldr/datetime.h"
 #include "baldr/graphconstants.h"

diff --git a/src/mjolnir/valhalla_benchmark_admins.cc b/src/mjolnir/valhalla_benchmark_admins.cc
@@ -4,10 +4,10 @@
 #include <vector>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <cxxopts.hpp>
 

diff --git a/test/gurka/test_avoids.cc b/test/gurka/test_avoids.cc
@@ -1,8 +1,8 @@
 #include "gurka.h"
 #include <boost/format.hpp>
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/register/multi_polygon.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
-#include <boost/geometry/multi/geometries/register/multi_polygon.hpp>
 #include <gtest/gtest.h>
 #include <valhalla/proto/options.pb.h>
 

diff --git a/test/gurka/test_oneways.cc b/test/gurka/test_oneways.cc
@@ -1,7 +1,7 @@
 #include "gurka.h"
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/register/multi_polygon.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
-#include <boost/geometry/multi/geometries/register/multi_polygon.hpp>
 #include <gtest/gtest.h>
 #include <valhalla/proto/options.pb.h>
 

diff --git a/valhalla/mjolnir/admin.h b/valhalla/mjolnir/admin.h
@@ -2,10 +2,10 @@
 #define VALHALLA_MJOLNIR_ADMIN_H_
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include <cstdint>
 #include <sqlite3.h>