summaryrefslogtreecommitdiff
path: root/include/mbgl/map
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-04-23 15:58:27 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-04-28 14:32:25 -0400
commit8bb7fc64ff2dbb4ce58d1a7127b8328fffeaa1de (patch)
tree4edb6a5092e2ca9618547926a1a243d3c2283108 /include/mbgl/map
parentbb7c453b3e29de4a854560dfca34a89fc832a39d (diff)
downloadqtlocation-mapboxgl-8bb7fc64ff2dbb4ce58d1a7127b8328fffeaa1de.tar.gz
Move Environment to MapContext
Diffstat (limited to 'include/mbgl/map')
-rw-r--r--include/mbgl/map/map.hpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 32b4afae7f..a15da5178b 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -18,8 +18,6 @@ namespace mbgl {
class FileSource;
class View;
-class Environment;
-class EnvironmentScope;
class MapData;
class MapContext;
class StillImage;
@@ -136,10 +134,8 @@ public:
bool getDebug() const;
private:
- const std::unique_ptr<Environment> env;
- std::unique_ptr<EnvironmentScope> scope;
const std::unique_ptr<MapData> data;
- std::unique_ptr<util::Thread<MapContext>> context;
+ const std::unique_ptr<util::Thread<MapContext>> context;
};
}