From 8c0acecbe362be4a40638491b67ee5fe3d23a65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Fri, 13 Feb 2015 15:09:11 -0800
Subject: [PATCH] fix handling around unique_ptr releases

---
 include/mbgl/storage/default/shared_request_base.hpp | 2 +-
 platform/darwin/image.mm                             | 1 -
 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 7745bef2b..2d5661560 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 4819d2cd3..a9044774d 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 ab1ee040f..522b23f22 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();
         }
     }
 }