diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-11-16 18:38:27 -0800 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-11-22 13:56:38 -0800 |
| commit | 3067b77c650f5dea0c00a7a92a9fc927e028c742 (patch) | |
| tree | 407bf2b4bf19678f1e7c2418f4fd0b4e18fbfef6 /include/mbgl/style | |
| parent | ba63d06cfc09b016ce0ddfcaaa297bd259cadf09 (diff) | |
| download | qtlocation-mapboxgl-3067b77c650f5dea0c00a7a92a9fc927e028c742.tar.gz | |
[core, ios, macos] Implement unique_any and remove linb::any
Diffstat (limited to 'include/mbgl/style')
| -rw-r--r-- | include/mbgl/style/layer.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/source.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index c6a3c0e735..eb2dbf830b 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -1,7 +1,7 @@ #pragma once #include <mbgl/util/noncopyable.hpp> -#include <mbgl/util/any.hpp> +#include <mbgl/util/unique_any.hpp> #include <mbgl/util/immutable.hpp> #include <mbgl/style/layer_type.hpp> #include <mbgl/style/types.hpp> @@ -126,7 +126,7 @@ public: // For use in SDK bindings, which store a reference to a platform-native peer // object here, so that separately-obtained references to this object share // identical platform-native peers. - any peer; + util::unique_any peer; }; } // namespace style diff --git a/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp index cec9619451..0b6a6c72d9 100644 --- a/include/mbgl/style/source.hpp +++ b/include/mbgl/style/source.hpp @@ -2,7 +2,7 @@ #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/optional.hpp> -#include <mbgl/util/any.hpp> +#include <mbgl/util/unique_any.hpp> #include <mbgl/util/immutable.hpp> #include <mbgl/style/types.hpp> @@ -76,7 +76,7 @@ public: // For use in SDK bindings, which store a reference to a platform-native peer // object here, so that separately-obtained references to this object share // identical platform-native peers. - any peer; + util::unique_any peer; }; } // namespace style |