From 5b8d90bf0073c29790e9acaaf12471296de054ff Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 26 Aug 2016 17:47:44 -0700 Subject: [PATCH] [core] Delete the now-unused ptr.hpp --- cmake/core-files.cmake | 1 - src/mbgl/renderer/render_tile.hpp | 1 - src/mbgl/sprite/sprite_atlas.hpp | 1 - src/mbgl/tile/tile_worker.hpp | 1 - src/mbgl/util/ptr.hpp | 26 -------------------------- 5 files changed, 30 deletions(-) delete mode 100644 src/mbgl/util/ptr.hpp diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index e2795072b..5c13e925b 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 82b60a66c..74669faaf 100644 --- a/src/mbgl/renderer/render_tile.hpp +++ b/src/mbgl/renderer/render_tile.hpp @@ -2,7 +2,6 @@ #include #include -#include #include #include diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 990ba59e0..b58a16ab5 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/src/mbgl/tile/tile_worker.hpp b/src/mbgl/tile/tile_worker.hpp index 872c058b4..f0113f738 100644 --- a/src/mbgl/tile/tile_worker.hpp +++ b/src/mbgl/tile/tile_worker.hpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/src/mbgl/util/ptr.hpp b/src/mbgl/util/ptr.hpp deleted file mode 100644 index 87c4e9f7c..000000000 --- a/src/mbgl/util/ptr.hpp +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include -#include - -namespace mbgl { -namespace util { - -template -class ptr : public ::std::shared_ptr { -public: - template - ptr(Args &&... args) - : ::std::shared_ptr(::std::forward(args)...) {} - - auto operator->() const -> decltype(this->::std::shared_ptr::operator->()) { - assert(*this); - return ::std::shared_ptr::operator->(); - } - auto operator*() const -> decltype(this->::std::shared_ptr::operator*()) { - assert(*this); - return ::std::shared_ptr::operator*(); - } -}; -} // namespace util -} // namespace mbgl