From 8939a7b7069124adac44ef822bfe6d97adcc14d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 14 Jan 2016 15:02:14 +0100
Subject: [PATCH] [core] move SharedSQLiteCache::get to SQLiteCache::getShared

---
 platform/default/default_file_source.cpp |  2 +-
 platform/default/sqlite_cache.cpp        |  4 ++--
 src/mbgl/storage/sqlite_cache.hpp        | 11 ++---------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp
index fcb45ee29..a1f8bc2c4 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -22,7 +22,7 @@ class DefaultFileSource::Impl {
 public:
     Impl(const std::string& cachePath, const std::string& assetRoot)
         : assetFileSource(assetRoot),
-          cache(SharedSQLiteCache::get(cachePath)),
+          cache(SQLiteCache::getShared(cachePath)),
           onlineFileSource(cache.get()) {
     }
 
diff --git a/platform/default/sqlite_cache.cpp b/platform/default/sqlite_cache.cpp
index 444637b9a..88bedec69 100644
--- a/platform/default/sqlite_cache.cpp
+++ b/platform/default/sqlite_cache.cpp
@@ -472,7 +472,7 @@ void SQLiteCache::Impl::refresh(const Resource& resource, Seconds expires) {
     }
 }
 
-std::shared_ptr<SQLiteCache> SharedSQLiteCache::get(const std::string &path) {
+std::shared_ptr<SQLiteCache> SQLiteCache::getShared(const std::string &path) {
     std::shared_ptr<SQLiteCache> temp = masterPtr.lock();
     if (!temp) {
         temp.reset(new SQLiteCache(path));
@@ -482,6 +482,6 @@ std::shared_ptr<SQLiteCache> SharedSQLiteCache::get(const std::string &path) {
     return temp;
 }
 
-std::weak_ptr<SQLiteCache> SharedSQLiteCache::masterPtr;
+std::weak_ptr<SQLiteCache> SQLiteCache::masterPtr;
 
 } // namespace mbgl
diff --git a/src/mbgl/storage/sqlite_cache.hpp b/src/mbgl/storage/sqlite_cache.hpp
index 94eeee3d4..fd02765e7 100644
--- a/src/mbgl/storage/sqlite_cache.hpp
+++ b/src/mbgl/storage/sqlite_cache.hpp
@@ -20,6 +20,8 @@ template <typename T> class Thread;
 
 class SQLiteCache : private util::noncopyable {
 public:
+    static std::shared_ptr<SQLiteCache> getShared(const std::string &path = ":memory:");
+
     SQLiteCache(const std::string &path = ":memory:");
     ~SQLiteCache();
 
@@ -35,15 +37,6 @@ public:
 
 private:
     const std::unique_ptr<util::Thread<Impl>> thread;
-};
-
-class SharedSQLiteCache : util::noncopyable {
-public:
-    static std::shared_ptr<SQLiteCache> get(const std::string &path = ":memory:");
-
-private:
-    SharedSQLiteCache() {}
-
     static std::weak_ptr<SQLiteCache> masterPtr;
 };