diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-09-16 16:38:32 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-09-24 16:14:09 +0200 |
| commit | f26bb724dc164b69b5358f30c6248fdf5cbd076b (patch) | |
| tree | 4c719a97ff02c86a22bcdcec6fc0f781c3bcd3e9 /include/mbgl/style/style.hpp | |
| parent | 6c526e56370a0f4dee9a4b6ed45489fcb14e3ff1 (diff) | |
| download | qtlocation-mapboxgl-f26bb724dc164b69b5358f30c6248fdf5cbd076b.tar.gz | |
use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness
Diffstat (limited to 'include/mbgl/style/style.hpp')
| -rw-r--r-- | include/mbgl/style/style.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/style/style.hpp b/include/mbgl/style/style.hpp index c09de6ebba..56f318ecbb 100644 --- a/include/mbgl/style/style.hpp +++ b/include/mbgl/style/style.hpp @@ -6,6 +6,7 @@ #include <mbgl/util/time.hpp> #include <mbgl/util/uv.hpp> +#include <mbgl/util/ptr.hpp> #include <cstdint> #include <map> @@ -13,7 +14,6 @@ #include <unordered_map> #include <vector> #include <set> -#include <memory> namespace mbgl { @@ -49,7 +49,7 @@ public: const std::string &getSpriteURL() const; public: - std::shared_ptr<StyleLayerGroup> layers; + util::ptr<StyleLayerGroup> layers; std::vector<std::string> appliedClasses; std::string glyph_url; |