diff options
author | Leith Bade <leith@mapbox.com> | 2015-09-24 12:18:59 +1000 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-09-24 12:22:19 +1000 |
commit | 2c4a9f6a3be8945559f127adb8695a11d833cd89 (patch) | |
tree | 442e4cac33bfd19c9fb349ca27c6e7509941caf1 /include | |
parent | 18bc490f40e997bc2a1cbaa2cf82a9ffd2fa2405 (diff) | |
download | qtlocation-mapboxgl-2c4a9f6a3be8945559f127adb8695a11d833cd89.tar.gz |
Refactor NativeMapView to hold std::unique_ptr to Map and DefaultFileSource
Add missing asserts to attach_jni_thread/detach_jni_thread
Fixes #2406
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/android/native_map_view.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp index 0a4e856db4..fe619ba6f2 100644 --- a/include/mbgl/android/native_map_view.hpp +++ b/include/mbgl/android/native_map_view.hpp @@ -91,8 +91,8 @@ private: // Ensure these are initialised last std::shared_ptr<mbgl::SQLiteCache> fileCache; - mbgl::DefaultFileSource fileSource; - mbgl::Map map; + std::unique_ptr<mbgl::DefaultFileSource> fileSource; + std::unique_ptr<mbgl::Map> map; std::atomic_flag clean = ATOMIC_FLAG_INIT; }; |