diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 14:47:58 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 17:56:48 -0800 |
| commit | 9b62661b07e86fc1d64e308fde3e15527c1cd8c8 (patch) | |
| tree | c27b37e3f94b53d4fdd5855d1eb68868ce803bae /src/mbgl/style/property_transition.hpp | |
| parent | 48cced9e311d5c1cf2a98937eeaf638c94456c8d (diff) | |
| download | qtlocation-mapboxgl-9b62661b07e86fc1d64e308fde3e15527c1cd8c8.tar.gz | |
[core] Use experimental optional instead of mapbox::util::optional
Diffstat (limited to 'src/mbgl/style/property_transition.hpp')
| -rw-r--r-- | src/mbgl/style/property_transition.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/property_transition.hpp b/src/mbgl/style/property_transition.hpp index 63bbf4607d..55b795e5db 100644 --- a/src/mbgl/style/property_transition.hpp +++ b/src/mbgl/style/property_transition.hpp @@ -2,16 +2,16 @@ #define MBGL_STYLE_PROPERTY_TRANSITION #include <mbgl/util/chrono.hpp> +#include <mbgl/util/optional.hpp> -#include <mapbox/optional.hpp> #include <cstdint> namespace mbgl { class PropertyTransition { public: - mapbox::util::optional<Duration> duration; - mapbox::util::optional<Duration> delay; + optional<Duration> duration; + optional<Duration> delay; }; } // namespace mbgl |