From f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 26 May 2015 15:18:27 +0200
Subject: Replace mbgl::util::make_unique<> with std::make_unique<>

---
 test/api/repeated_render.cpp        |  2 +-
 test/api/set_style.cpp              |  2 +-
 test/headless/headless.cpp          |  1 -
 test/miscellaneous/bilinear.cpp     |  3 +--
 test/miscellaneous/clip_ids.cpp     |  1 -
 test/resources/mock_file_source.cpp |  2 +-
 test/resources/mock_file_source.hpp |  1 +
 test/resources/resource_loader.cpp  | 16 ++++++++--------
 test/storage/database.cpp           | 22 +++++++++++-----------
 9 files changed, 24 insertions(+), 26 deletions(-)

(limited to 'test')

diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index f563b00071..7f55237744 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -20,7 +20,7 @@ TEST(API, RepeatedRender) {
     HeadlessView view(display);
     DefaultFileSource fileSource(nullptr);
 
-    Log::setObserver(util::make_unique<FixtureLogObserver>());
+    Log::setObserver(std::make_unique<FixtureLogObserver>());
 
     Map map(view, fileSource, MapMode::Still);
 
diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp
index 01ce1f0252..72260e6343 100644
--- a/test/api/set_style.cpp
+++ b/test/api/set_style.cpp
@@ -14,7 +14,7 @@ TEST(API, SetStyle) {
     HeadlessView view(display);
     DefaultFileSource fileSource(nullptr);
 
-    Log::setObserver(util::make_unique<FixtureLogObserver>());
+    Log::setObserver(std::make_unique<FixtureLogObserver>());
 
     {
         Map map(view, fileSource, MapMode::Still);
diff --git a/test/headless/headless.cpp b/test/headless/headless.cpp
index 8dfed0383b..c65e9855e7 100644
--- a/test/headless/headless.cpp
+++ b/test/headless/headless.cpp
@@ -4,7 +4,6 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/still_image.hpp>
 #include <mbgl/util/image.hpp>
-#include <mbgl/util/std.hpp>
 
 #include <mbgl/util/io.hpp>
 #include <rapidjson/document.h>
diff --git a/test/miscellaneous/bilinear.cpp b/test/miscellaneous/bilinear.cpp
index 9808e20fef..bdfb9d9117 100644
--- a/test/miscellaneous/bilinear.cpp
+++ b/test/miscellaneous/bilinear.cpp
@@ -3,7 +3,6 @@
 #include <mbgl/util/scaling.hpp>
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/io.hpp>
-#include <mbgl/util/std.hpp>
 
 #include <algorithm>
 #include <cstring>
@@ -24,7 +23,7 @@ TEST(Bilinear, Scaling) {
     const uint32_t *srcData = reinterpret_cast<const uint32_t *>(src + 8);
     const vec2<uint32_t> srcSize { width, height };
     const vec2<uint32_t> dstSize { 128, 128 };
-    auto dst = util::make_unique<uint32_t[]>(dstSize.x * dstSize.y);
+    auto dst = std::make_unique<uint32_t[]>(dstSize.x * dstSize.y);
     uint32_t *dstData = dst.get();
     std::fill(dstData, dstData + dstSize.x * dstSize.y, 0xFFFF00FF);
 
diff --git a/test/miscellaneous/clip_ids.cpp b/test/miscellaneous/clip_ids.cpp
index e176810862..dd16173a3f 100644
--- a/test/miscellaneous/clip_ids.cpp
+++ b/test/miscellaneous/clip_ids.cpp
@@ -5,7 +5,6 @@
 
 #include <mbgl/util/clip_id.hpp>
 #include <mbgl/map/tile.hpp>
-#include <mbgl/util/std.hpp>
 
 using namespace mbgl;
 
diff --git a/test/resources/mock_file_source.cpp b/test/resources/mock_file_source.cpp
index b6ff99c743..0a9d448d45 100644
--- a/test/resources/mock_file_source.cpp
+++ b/test/resources/mock_file_source.cpp
@@ -31,7 +31,7 @@ void MockFileSource::Impl::handleRequest(Request* req) const {
 }
 
 MockFileSource::MockFileSource(const std::string& matchFail)
-    : thread_(util::make_unique<util::Thread<Impl>>("FileSource", util::ThreadPriority::Low, matchFail)) {
+    : thread_(std::make_unique<util::Thread<Impl>>("FileSource", util::ThreadPriority::Low, matchFail)) {
 }
 
 Request* MockFileSource::request(const Resource& resource, uv_loop_t* loop, Callback callback) {
diff --git a/test/resources/mock_file_source.hpp b/test/resources/mock_file_source.hpp
index 8c76bd5396..55ecd95c13 100644
--- a/test/resources/mock_file_source.hpp
+++ b/test/resources/mock_file_source.hpp
@@ -4,6 +4,7 @@
 #include <mbgl/storage/file_source.hpp>
 
 #include <string>
+#include <memory>
 
 namespace mbgl {
 
diff --git a/test/resources/resource_loader.cpp b/test/resources/resource_loader.cpp
index 4d8dcc63a0..83807156ed 100644
--- a/test/resources/resource_loader.cpp
+++ b/test/resources/resource_loader.cpp
@@ -30,13 +30,13 @@ public:
         : env_(fileSource),
           envScope_(env_, ThreadType::Map, "Map"),
           data_(view, MapMode::Still),
-          glyphStore_(util::make_unique<GlyphStore>(loop, env_)),
-          glyphAtlas_(util::make_unique<GlyphAtlas>(1024, 1024)),
-          spriteAtlas_(util::make_unique<SpriteAtlas>(512, 512)),
-          texturePool_(util::make_unique<TexturePool>()),
-          style_(util::make_unique<Style>()),
-          resourceLoader_(util::make_unique<ResourceLoader>()),
-          asyncUpdate(util::make_unique<uv::async>(loop, [this] { update(); })),
+          glyphStore_(std::make_unique<GlyphStore>(loop, env_)),
+          glyphAtlas_(std::make_unique<GlyphAtlas>(1024, 1024)),
+          spriteAtlas_(std::make_unique<SpriteAtlas>(512, 512)),
+          texturePool_(std::make_unique<TexturePool>()),
+          style_(std::make_unique<Style>()),
+          resourceLoader_(std::make_unique<ResourceLoader>()),
+          asyncUpdate(std::make_unique<uv::async>(loop, [this] { update(); })),
           callback_(callback) {
         asyncUpdate->unref();
 
@@ -147,7 +147,7 @@ TEST_P(ResourceLoaderTest, RequestFailure) {
     };
 
     std::unique_ptr<util::Thread<MockMapContext>> context(
-        util::make_unique<util::Thread<MockMapContext>>(
+        std::make_unique<util::Thread<MockMapContext>>(
             "Map", util::ThreadPriority::Regular, view, fileSource, callback));
 
     uv_run(loop.get(), UV_RUN_DEFAULT);
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<FixtureLogObserver>());
+    Log::setObserver(std::make_unique<FixtureLogObserver>());
 
     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<FixtureLogObserver>());
+    Log::setObserver(std::make_unique<FixtureLogObserver>());
 
     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<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         std::unique_ptr<Response> 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<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         std::unique_ptr<Response> 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<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         auto response = std::make_shared<Response>();
         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<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         auto response = std::make_shared<Response>();
         response->data = "Demo";
@@ -201,7 +201,7 @@ TEST_F(Storage, DatabaseLockedRefresh) {
 
     {
         // Adds a file.
-        Log::setObserver(util::make_unique<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         auto response = std::make_shared<Response>();
         response->data = "Demo";
@@ -216,7 +216,7 @@ TEST_F(Storage, DatabaseLockedRefresh) {
 
     {
         // Then, try to refresh it.
-        Log::setObserver(util::make_unique<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         auto response = std::make_shared<Response>();
         response->data = "Demo";
@@ -244,7 +244,7 @@ TEST_F(Storage, DatabaseDeleted) {
 
     {
         // Adds a file.
-        Log::setObserver(util::make_unique<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         auto response = std::make_shared<Response>();
         response->data = "Demo";
@@ -260,7 +260,7 @@ TEST_F(Storage, DatabaseDeleted) {
 
     {
         // Adds a file.
-        Log::setObserver(util::make_unique<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         auto response = std::make_shared<Response>();
         response->data = "Demo";
@@ -289,7 +289,7 @@ TEST_F(Storage, DatabaseInvalid) {
 
     {
         // Adds a file.
-        Log::setObserver(util::make_unique<FixtureLogObserver>());
+        Log::setObserver(std::make_unique<FixtureLogObserver>());
 
         auto response = std::make_shared<Response>();
         response->data = "Demo";
-- 
cgit v1.2.1