From f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 26 May 2015 15:18:27 +0200 Subject: Replace mbgl::util::make_unique<> with std::make_unique<> --- test/storage/database.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'test/storage') diff --git a/test/storage/database.cpp b/test/storage/database.cpp index a44c7ff4b4..b54b69a133 100644 --- a/test/storage/database.cpp +++ b/test/storage/database.cpp @@ -11,7 +11,7 @@ TEST_F(Storage, DatabaseDoesNotExist) { using namespace mbgl; - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); SQLiteCache::Impl cache(nullptr, "test/fixtures/404/cache.db"); @@ -52,7 +52,7 @@ TEST_F(Storage, DatabaseCreate) { createDir("test/fixtures/database"); deleteFile("test/fixtures/database/cache.db"); - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); SQLiteCache::Impl cache(nullptr, "test/fixtures/database/cache.db"); @@ -113,7 +113,7 @@ TEST_F(Storage, DatabaseLockedRead) { { // First request should fail. - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); std::unique_ptr res = cache.get({ Resource::Unknown, "mapbox://test" }); EXPECT_EQ(nullptr, res.get()); @@ -129,7 +129,7 @@ TEST_F(Storage, DatabaseLockedRead) { { // First, try getting a file (the cache value should not exist). - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); std::unique_ptr res = cache.get({ Resource::Unknown, "mapbox://test" }); EXPECT_EQ(nullptr, res.get()); @@ -153,7 +153,7 @@ TEST_F(Storage, DatabaseLockedWrite) { { // Adds a file (which should fail). - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); auto response = std::make_shared(); cache.put({ Resource::Unknown, "mapbox://test" }, response); @@ -170,7 +170,7 @@ TEST_F(Storage, DatabaseLockedWrite) { { // Then, set a file and obtain it again. - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); auto response = std::make_shared(); response->data = "Demo"; @@ -201,7 +201,7 @@ TEST_F(Storage, DatabaseLockedRefresh) { { // Adds a file. - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); auto response = std::make_shared(); response->data = "Demo"; @@ -216,7 +216,7 @@ TEST_F(Storage, DatabaseLockedRefresh) { { // Then, try to refresh it. - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); auto response = std::make_shared(); response->data = "Demo"; @@ -244,7 +244,7 @@ TEST_F(Storage, DatabaseDeleted) { { // Adds a file. - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); auto response = std::make_shared(); response->data = "Demo"; @@ -260,7 +260,7 @@ TEST_F(Storage, DatabaseDeleted) { { // Adds a file. - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); auto response = std::make_shared(); response->data = "Demo"; @@ -289,7 +289,7 @@ TEST_F(Storage, DatabaseInvalid) { { // Adds a file. - Log::setObserver(util::make_unique()); + Log::setObserver(std::make_unique()); auto response = std::make_shared(); response->data = "Demo"; -- cgit v1.2.1