Move Environment to MapContext

2015-04-23 15:58:27 -07:00
parent bb7c453b3e
commit 8bb7fc64ff
4 changed files with 10 additions and 38 deletions
--- 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;
 };

 }