diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-13 15:09:11 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-03-06 16:17:49 +0100 |
| commit | 8c0acecbe362be4a40638491b67ee5fe3d23a65e (patch) | |
| tree | 0c9d87f4f90e335703d47e9e207977095cd2b4f7 | |
| parent | 8408dc9e4dbb0302d523e893861b60473a33c91e (diff) | |
| download | qtlocation-mapboxgl-8c0acecbe362be4a40638491b67ee5fe3d23a65e.tar.gz | |
fix handling around unique_ptr releases
| -rw-r--r-- | include/mbgl/storage/default/shared_request_base.hpp | 2 | ||||
| -rw-r--r-- | platform/darwin/image.mm | 1 | ||||
| -rw-r--r-- | platform/default/sqlite_cache.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/mbgl/storage/default/shared_request_base.hpp b/include/mbgl/storage/default/shared_request_base.hpp index 7745bef2b5..2d56615608 100644 --- a/include/mbgl/storage/default/shared_request_base.hpp +++ b/include/mbgl/storage/default/shared_request_base.hpp @@ -34,7 +34,7 @@ public: MBGL_VERIFY_THREAD(tid); if (source) { - source->notify(this, observers, std::shared_ptr<const Response>(response.release()), + source->notify(this, observers, std::shared_ptr<const Response>(std::move(response)), hint); } } diff --git a/platform/darwin/image.mm b/platform/darwin/image.mm index 4819d2cd3c..a9044774dc 100644 --- a/platform/darwin/image.mm +++ b/platform/darwin/image.mm @@ -108,7 +108,6 @@ Image::Image(const std::string &source_data) { CFRelease(data); width = 0; height = 0; - img.release(); return; } diff --git a/platform/default/sqlite_cache.cpp b/platform/default/sqlite_cache.cpp index ab1ee040ff..522b23f22c 100644 --- a/platform/default/sqlite_cache.cpp +++ b/platform/default/sqlite_cache.cpp @@ -163,7 +163,7 @@ void SQLiteCache::createDatabase() { db->exec(sql); } catch (mapbox::sqlite::Exception &ex) { Log::Error(Event::Database, "Failed to create database: %s", ex.what()); - db.release(); + db.reset(); } } } |