Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use mapbox::util::optional instead of std::experimental::optional

Browse Source
This commit is contained in:
Michael Krasnyk 2018-04-26 20:06:58 +02:00 committed by Patrick Niklaus
parent 8b866502d1
commit 41c31a2388
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp vendored
View File

@ -8,7 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include <experimental/optional> #include <mapbox/optional.hpp>
namespace mapbox { namespace mapbox {
namespace geometry { namespace geometry {
@ -54,13 +54,13 @@ struct feature
geometry_type geometry; geometry_type geometry;
property_map properties {}; property_map properties {};
std::experimental::optional<identifier> id {}; mapbox::util::optional<identifier> id {};
// GCC 4.9 does not support C++14 aggregates with non-static data member // GCC 4.9 does not support C++14 aggregates with non-static data member
// initializers. // initializers.
feature(geometry_type geometry_, feature(geometry_type geometry_,
property_map properties_ = property_map {}, property_map properties_ = property_map {},
std::experimental::optional<identifier> id_ = std::experimental::optional<identifier> {}) mapbox::util::optional<identifier> id_ = mapbox::util::optional<identifier> {})
: geometry(std::move(geometry_)), : geometry(std::move(geometry_)),
properties(std::move(properties_)), properties(std::move(properties_)),
id(std::move(id_)) {} id(std::move(id_)) {}