From 41c31a2388278fdf8cfc37781fc179f947d5a4b6 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Thu, 26 Apr 2018 20:06:58 +0200 Subject: [PATCH] Use mapbox::util::optional instead of std::experimental::optional --- .../geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp b/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp index 20d2ddf6b..91354442e 100644 --- a/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp +++ b/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace mapbox { namespace geometry { @@ -54,13 +54,13 @@ struct feature geometry_type geometry; property_map properties {}; - std::experimental::optional id {}; + mapbox::util::optional id {}; // GCC 4.9 does not support C++14 aggregates with non-static data member // initializers. feature(geometry_type geometry_, property_map properties_ = property_map {}, - std::experimental::optional id_ = std::experimental::optional {}) + mapbox::util::optional id_ = mapbox::util::optional {}) : geometry(std::move(geometry_)), properties(std::move(properties_)), id(std::move(id_)) {}