diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-08-26 17:47:44 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-06 12:52:13 -0700 |
| commit | 5b8d90bf0073c29790e9acaaf12471296de054ff (patch) | |
| tree | c6c03035384248b674a890e7d0c70c83be9f4b48 | |
| parent | 0afd14ae29e03f2781981180ddc42208e3da67c0 (diff) | |
| download | qtlocation-mapboxgl-5b8d90bf0073c29790e9acaaf12471296de054ff.tar.gz | |
[core] Delete the now-unused ptr.hpp
| -rw-r--r-- | cmake/core-files.cmake | 1 | ||||
| -rw-r--r-- | src/mbgl/renderer/render_tile.hpp | 1 | ||||
| -rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 1 | ||||
| -rw-r--r-- | src/mbgl/tile/tile_worker.hpp | 1 | ||||
| -rw-r--r-- | src/mbgl/util/ptr.hpp | 26 |
5 files changed, 0 insertions, 30 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index e2795072bb..5c13e925be 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -438,7 +438,6 @@ set(MBGL_CORE_FILES src/mbgl/util/merge_lines.hpp src/mbgl/util/premultiply.cpp src/mbgl/util/premultiply.hpp - src/mbgl/util/ptr.hpp src/mbgl/util/rapidjson.hpp src/mbgl/util/raster.cpp src/mbgl/util/raster.hpp diff --git a/src/mbgl/renderer/render_tile.hpp b/src/mbgl/renderer/render_tile.hpp index 82b60a66c7..74669faaf9 100644 --- a/src/mbgl/renderer/render_tile.hpp +++ b/src/mbgl/renderer/render_tile.hpp @@ -2,7 +2,6 @@ #include <mbgl/tile/tile_id.hpp> #include <mbgl/util/mat4.hpp> -#include <mbgl/util/ptr.hpp> #include <mbgl/util/clip_id.hpp> #include <mbgl/style/types.hpp> diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 990ba59e03..b58a16ab53 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -4,7 +4,6 @@ #include <mbgl/gl/gl.hpp> #include <mbgl/gl/object_store.hpp> #include <mbgl/util/noncopyable.hpp> -#include <mbgl/util/ptr.hpp> #include <mbgl/util/optional.hpp> #include <atomic> diff --git a/src/mbgl/tile/tile_worker.hpp b/src/mbgl/tile/tile_worker.hpp index 872c058b43..f0113f738c 100644 --- a/src/mbgl/tile/tile_worker.hpp +++ b/src/mbgl/tile/tile_worker.hpp @@ -4,7 +4,6 @@ #include <mbgl/tile/tile_id.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/variant.hpp> -#include <mbgl/util/ptr.hpp> #include <mbgl/text/placement_config.hpp> #include <mbgl/geometry/feature_index.hpp> diff --git a/src/mbgl/util/ptr.hpp b/src/mbgl/util/ptr.hpp deleted file mode 100644 index 87c4e9f7cf..0000000000 --- a/src/mbgl/util/ptr.hpp +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include <memory> -#include <cassert> - -namespace mbgl { -namespace util { - -template <typename T> -class ptr : public ::std::shared_ptr<T> { -public: - template <typename... Args> - ptr(Args &&... args) - : ::std::shared_ptr<T>(::std::forward<Args>(args)...) {} - - auto operator->() const -> decltype(this->::std::shared_ptr<T>::operator->()) { - assert(*this); - return ::std::shared_ptr<T>::operator->(); - } - auto operator*() const -> decltype(this->::std::shared_ptr<T>::operator*()) { - assert(*this); - return ::std::shared_ptr<T>::operator*(); - } -}; -} // namespace util -} // namespace mbgl |