diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-01-14 15:02:14 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-01-15 10:38:09 +0100 |
commit | 8939a7b7069124adac44ef822bfe6d97adcc14d6 (patch) | |
tree | 2ba38638a022a49a62eeb1429248a3e14bced48b /src/mbgl/storage | |
parent | f62d41ae05adade69fb08cff3c071b960c25c857 (diff) | |
download | qtlocation-mapboxgl-8939a7b7069124adac44ef822bfe6d97adcc14d6.tar.gz |
[core] move SharedSQLiteCache::get to SQLiteCache::getShared
Diffstat (limited to 'src/mbgl/storage')
-rw-r--r-- | src/mbgl/storage/sqlite_cache.hpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mbgl/storage/sqlite_cache.hpp b/src/mbgl/storage/sqlite_cache.hpp index 94eeee3d46..fd02765e78 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; }; |