Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts: src/mbgl/map/map.cpp
This commit is contained in:
@@ -64,9 +64,6 @@ public:
|
||||
// Forces a map update: always triggers a rerender.
|
||||
void update();
|
||||
|
||||
// Triggers a cleanup that releases resources.
|
||||
void cleanup();
|
||||
|
||||
// Releases resources immediately
|
||||
void terminate();
|
||||
|
||||
@@ -157,7 +154,6 @@ private:
|
||||
std::thread thread;
|
||||
std::unique_ptr<uv::async> asyncTerminate;
|
||||
std::unique_ptr<uv::async> asyncRender;
|
||||
std::unique_ptr<uv::async> asyncCleanup;
|
||||
|
||||
bool terminating = false;
|
||||
bool pausing = false;
|
||||
|
||||
Reference in New Issue
Block a user