From b8fe5f5e395ea5c4c79de84dddbbcaa3d82e6890 Mon Sep 17 00:00:00 2001
From: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
Date: Sun, 30 Jun 2024 19:36:11 +0200
Subject: [PATCH] Yet another attempt to get rid of boost::optional

---
 include/engine/api/base_parameters.hpp                   | 2 +-
 include/engine/api/json_factory.hpp                      | 2 +-
 include/engine/api/trip_parameters.hpp                   | 2 +-
 include/engine/geospatial_query.hpp                      | 2 +-
 include/engine/guidance/assemble_steps.hpp               | 2 +-
 include/engine/guidance/route_leg.hpp                    | 2 +-
 include/engine/internal_route_result.hpp                 | 2 +-
 include/engine/routing_algorithms/shortest_path_impl.hpp | 2 +-
 include/nodejs/node_osrm_support.hpp                     | 2 +-
 include/server/api/base_parameters_grammar.hpp           | 2 +-
 include/server/api/url_parser.hpp                        | 2 +-
 src/engine/api/json_factory.cpp                          | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/engine/api/base_parameters.hpp b/include/engine/api/base_parameters.hpp
index 905cb69ee..1a35a030d 100644
--- a/include/engine/api/base_parameters.hpp
+++ b/include/engine/api/base_parameters.hpp
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "engine/hint.hpp"
 #include "util/coordinate.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <algorithm>
 #include <vector>
diff --git a/include/engine/api/json_factory.hpp b/include/engine/api/json_factory.hpp
index 2b32b4446..001f44ff8 100644
--- a/include/engine/api/json_factory.hpp
+++ b/include/engine/api/json_factory.hpp
@@ -12,7 +12,7 @@
 #include "util/coordinate.hpp"
 #include "util/json_container.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <algorithm>
 #include <iterator>
diff --git a/include/engine/api/trip_parameters.hpp b/include/engine/api/trip_parameters.hpp
index 7ad785ac0..cc3f4d938 100644
--- a/include/engine/api/trip_parameters.hpp
+++ b/include/engine/api/trip_parameters.hpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "engine/api/route_parameters.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 #include <vector>
 
 namespace osrm::engine::api
diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp
index 46bcd0171..915dfec3e 100644
--- a/include/engine/geospatial_query.hpp
+++ b/include/engine/geospatial_query.hpp
@@ -12,7 +12,7 @@
 
 #include "osrm/coordinate.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <algorithm>
 #include <cmath>
diff --git a/include/engine/guidance/assemble_steps.hpp b/include/engine/guidance/assemble_steps.hpp
index b25b9976d..588e402b3 100644
--- a/include/engine/guidance/assemble_steps.hpp
+++ b/include/engine/guidance/assemble_steps.hpp
@@ -17,9 +17,9 @@
 #include "util/guidance/turn_lanes.hpp"
 #include "util/typedefs.hpp"
 
-#include <boost/optional.hpp>
 #include <cstddef>
 #include <guidance/turn_bearing.hpp>
+#include <optional>
 #include <vector>
 
 namespace osrm::engine::guidance
diff --git a/include/engine/guidance/route_leg.hpp b/include/engine/guidance/route_leg.hpp
index 681c4c40e..43149e4fc 100644
--- a/include/engine/guidance/route_leg.hpp
+++ b/include/engine/guidance/route_leg.hpp
@@ -3,7 +3,7 @@
 
 #include "engine/guidance/route_step.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <string>
 #include <vector>
diff --git a/include/engine/internal_route_result.hpp b/include/engine/internal_route_result.hpp
index 2cec335b1..78f5d1196 100644
--- a/include/engine/internal_route_result.hpp
+++ b/include/engine/internal_route_result.hpp
@@ -15,7 +15,7 @@
 #include "util/integer_range.hpp"
 #include "util/typedefs.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 #include <vector>
 
 namespace osrm::engine
diff --git a/include/engine/routing_algorithms/shortest_path_impl.hpp b/include/engine/routing_algorithms/shortest_path_impl.hpp
index 7f0dcf6bf..2cd3ccffb 100644
--- a/include/engine/routing_algorithms/shortest_path_impl.hpp
+++ b/include/engine/routing_algorithms/shortest_path_impl.hpp
@@ -4,7 +4,7 @@
 #include "engine/routing_algorithms/shortest_path.hpp"
 
 #include <boost/assert.hpp>
-#include <boost/optional.hpp>
+#include <optional>
 
 namespace osrm::engine::routing_algorithms
 {
diff --git a/include/nodejs/node_osrm_support.hpp b/include/nodejs/node_osrm_support.hpp
index 932624218..f428308e5 100644
--- a/include/nodejs/node_osrm_support.hpp
+++ b/include/nodejs/node_osrm_support.hpp
@@ -21,7 +21,7 @@
 #include <napi.h>
 
 #include <boost/assert.hpp>
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <algorithm>
 #include <iterator>
diff --git a/include/server/api/base_parameters_grammar.hpp b/include/server/api/base_parameters_grammar.hpp
index 281021f15..a09455f93 100644
--- a/include/server/api/base_parameters_grammar.hpp
+++ b/include/server/api/base_parameters_grammar.hpp
@@ -7,9 +7,9 @@
 #include "engine/hint.hpp"
 #include "engine/polyline_compressor.hpp"
 
-#include <boost/optional.hpp>
 #include <boost/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
+#include <optional>
 
 #include <limits>
 #include <string>
diff --git a/include/server/api/url_parser.hpp b/include/server/api/url_parser.hpp
index 36ae758c4..84c07bc7b 100644
--- a/include/server/api/url_parser.hpp
+++ b/include/server/api/url_parser.hpp
@@ -3,7 +3,7 @@
 
 #include "server/api/parsed_url.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <string>
 
diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp
index 27d01000b..a17ea7799 100644
--- a/src/engine/api/json_factory.cpp
+++ b/src/engine/api/json_factory.cpp
@@ -11,7 +11,7 @@
 #include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <algorithm>
 #include <iterator>