From f2e658d962a1e80383391adfa12bd138fcbc1a9f Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 30 Mar 2015 17:28:09 -0700 Subject: [PATCH] Remove unused --- src/mbgl/map/tile_data.hpp | 14 +------------- src/mbgl/renderer/debug_bucket.cpp | 2 -- src/mbgl/renderer/line_bucket.cpp | 2 -- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/mbgl/map/tile_data.hpp b/src/mbgl/map/tile_data.hpp index cce346d83..a5598fee3 100644 --- a/src/mbgl/map/tile_data.hpp +++ b/src/mbgl/map/tile_data.hpp @@ -9,8 +9,6 @@ #include #include -#include -#include #include #include @@ -22,7 +20,6 @@ typedef struct uv_loop_s uv_loop_t; namespace mbgl { -class Map; class Environment; class Painter; class SourceInfo; @@ -32,12 +29,6 @@ class Request; class TileData : public std::enable_shared_from_this, private util::noncopyable { public: - struct exception : std::exception {}; - struct geometry_too_long_exception : exception {}; - -public: - typedef util::ptr Ptr; - enum class State { invalid, initial, @@ -47,7 +38,6 @@ public: obsolete }; -public: TileData(Tile::ID const &id, const SourceInfo &); ~TileData(); @@ -65,16 +55,14 @@ public: virtual void render(Painter &painter, const StyleLayer &layer_desc, const mat4 &matrix) = 0; virtual bool hasData(StyleLayer const &layer_desc) const = 0; -public: const Tile::ID id; const std::string name; std::atomic state; -public: +protected: const SourceInfo& source; Environment& env; -protected: Request *req = nullptr; std::string data; diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp index 3c56401e1..6104e2456 100644 --- a/src/mbgl/renderer/debug_bucket.cpp +++ b/src/mbgl/renderer/debug_bucket.cpp @@ -5,8 +5,6 @@ #include -struct geometry_too_long_exception : std::exception {}; - using namespace mbgl; DebugBucket::DebugBucket(DebugFontBuffer& fontBuffer_) diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp index 6eea0d8d0..935e6b2b7 100644 --- a/src/mbgl/renderer/line_bucket.cpp +++ b/src/mbgl/renderer/line_bucket.cpp @@ -12,8 +12,6 @@ #include -struct geometry_too_long_exception : std::exception {}; - using namespace mbgl; LineBucket::LineBucket(std::unique_ptr styleLayout_,