diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2015-05-26 15:18:27 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2015-05-26 17:57:38 +0200 |
commit | f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed (patch) | |
tree | 31102ca2b739d2b21fcfc231585830969f2b4fa4 /src/mbgl/storage | |
parent | fdf6026e6249f99b260f15ec672a35c7e9db950d (diff) | |
download | qtlocation-mapboxgl-f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed.tar.gz |
Replace mbgl::util::make_unique<> with std::make_unique<>
Diffstat (limited to 'src/mbgl/storage')
-rw-r--r-- | src/mbgl/storage/default_file_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/storage/request.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp index 78a1132f17..b46696aaa3 100644 --- a/src/mbgl/storage/default_file_source.cpp +++ b/src/mbgl/storage/default_file_source.cpp @@ -28,7 +28,7 @@ namespace algo = boost::algorithm; namespace mbgl { DefaultFileSource::DefaultFileSource(FileCache* cache, const std::string& root) - : thread(util::make_unique<util::Thread<Impl>>("FileSource", util::ThreadPriority::Low, cache, root)) { + : thread(std::make_unique<util::Thread<Impl>>("FileSource", util::ThreadPriority::Low, cache, root)) { } DefaultFileSource::~DefaultFileSource() { diff --git a/src/mbgl/storage/request.cpp b/src/mbgl/storage/request.cpp index a6d845ce4a..b653a41e71 100644 --- a/src/mbgl/storage/request.cpp +++ b/src/mbgl/storage/request.cpp @@ -4,7 +4,6 @@ #include <mbgl/storage/response.hpp> #include <mbgl/util/util.hpp> -#include <mbgl/util/std.hpp> #include <mbgl/util/uv_detail.hpp> #include <cassert> @@ -16,7 +15,7 @@ struct Request::Canceled { std::mutex mutex; bool confirmed = false; }; // Note: This requires that loop is running in the current thread (or not yet running). Request::Request(const Resource &resource_, uv_loop_t *loop, Callback callback_) - : async(util::make_unique<uv::async>(loop, [this] { notifyCallback(); })), + : async(std::make_unique<uv::async>(loop, [this] { notifyCallback(); })), callback(callback_), resource(resource_) { } @@ -62,7 +61,7 @@ void Request::notify(const std::shared_ptr<const Response> &response_) { void Request::cancel() { assert(async); assert(!canceled); - canceled = util::make_unique<Canceled>(); + canceled = std::make_unique<Canceled>(); } |