From f856396131bdacd1594e6a732cb9422f43d7e211 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Sun, 19 Apr 2020 21:10:12 +0300 Subject: [PATCH] [core] Fix -Werror={pessimizing,redundant}-move from GCC 9 --- platform/default/src/mbgl/storage/asset_file_source.cpp | 2 +- platform/default/src/mbgl/storage/database_file_source.cpp | 2 +- platform/default/src/mbgl/storage/local_file_source.cpp | 2 +- platform/default/src/mbgl/storage/main_resource_loader.cpp | 2 +- platform/default/src/mbgl/storage/online_file_source.cpp | 2 +- src/mbgl/gl/program.hpp | 4 +--- src/mbgl/gl/renderer_backend.cpp | 3 +-- src/mbgl/layout/symbol_layout.cpp | 2 +- src/mbgl/style/conversion/layer.cpp | 2 +- test/src/mbgl/test/stub_file_source.cpp | 2 +- 10 files changed, 10 insertions(+), 13 deletions(-) diff --git a/platform/default/src/mbgl/storage/asset_file_source.cpp b/platform/default/src/mbgl/storage/asset_file_source.cpp index 278411026..9d1dba311 100644 --- a/platform/default/src/mbgl/storage/asset_file_source.cpp +++ b/platform/default/src/mbgl/storage/asset_file_source.cpp @@ -51,7 +51,7 @@ std::unique_ptr AssetFileSource::request(const Resource& resource, impl->actor().invoke(&Impl::request, resource.url, req->actor()); - return std::move(req); + return req; } bool AssetFileSource::canRequest(const Resource& resource) const { diff --git a/platform/default/src/mbgl/storage/database_file_source.cpp b/platform/default/src/mbgl/storage/database_file_source.cpp index 50c444274..27424e180 100644 --- a/platform/default/src/mbgl/storage/database_file_source.cpp +++ b/platform/default/src/mbgl/storage/database_file_source.cpp @@ -175,7 +175,7 @@ DatabaseFileSource::~DatabaseFileSource() = default; std::unique_ptr DatabaseFileSource::request(const Resource& resource, Callback callback) { auto req = std::make_unique(std::move(callback)); impl->actor().invoke(&DatabaseFileSourceThread::request, resource, req->actor()); - return std::move(req); + return req; } void DatabaseFileSource::forward(const Resource& res, const Response& response, std::function callback) { diff --git a/platform/default/src/mbgl/storage/local_file_source.cpp b/platform/default/src/mbgl/storage/local_file_source.cpp index 5d92e711a..945e4b916 100644 --- a/platform/default/src/mbgl/storage/local_file_source.cpp +++ b/platform/default/src/mbgl/storage/local_file_source.cpp @@ -47,7 +47,7 @@ std::unique_ptr LocalFileSource::request(const Resource& resource, impl->actor().invoke(&Impl::request, resource.url, req->actor()); - return std::move(req); + return req; } bool LocalFileSource::canRequest(const Resource& resource) const { diff --git a/platform/default/src/mbgl/storage/main_resource_loader.cpp b/platform/default/src/mbgl/storage/main_resource_loader.cpp index 6dcb38b72..1658ca4a5 100644 --- a/platform/default/src/mbgl/storage/main_resource_loader.cpp +++ b/platform/default/src/mbgl/storage/main_resource_loader.cpp @@ -151,7 +151,7 @@ public: actorRef.invoke(&MainResourceLoaderThread::cancel, req); }); thread->actor().invoke(&MainResourceLoaderThread::request, req.get(), resource, req->actor()); - return std::move(req); + return req; } bool canRequest(const Resource& resource) const { diff --git a/platform/default/src/mbgl/storage/online_file_source.cpp b/platform/default/src/mbgl/storage/online_file_source.cpp index aa854933d..a5274c6b3 100644 --- a/platform/default/src/mbgl/storage/online_file_source.cpp +++ b/platform/default/src/mbgl/storage/online_file_source.cpp @@ -302,7 +302,7 @@ public: req->onCancel( [actorRef = thread->actor(), req = req.get()]() { actorRef.invoke(&OnlineFileSourceThread::cancel, req); }); thread->actor().invoke(&OnlineFileSourceThread::request, req.get(), std::move(res), req->actor()); - return std::move(req); + return req; } void pause() { thread->pause(); } diff --git a/src/mbgl/gl/program.hpp b/src/mbgl/gl/program.hpp index 6cfe05bf5..dbac6841f 100644 --- a/src/mbgl/gl/program.hpp +++ b/src/mbgl/gl/program.hpp @@ -72,9 +72,7 @@ public: (programs::gl::shaderSource() + programs::gl::fragmentPreludeOffset), (programs::gl::shaderSource() + fragmentOffset) }; - auto result = std::make_unique(context, vertexSource, fragmentSource); - - return std::move(result); + return std::make_unique(context, vertexSource, fragmentSource); } UniqueProgram program; diff --git a/src/mbgl/gl/renderer_backend.cpp b/src/mbgl/gl/renderer_backend.cpp index fe0ca4b5b..1f52ce06a 100644 --- a/src/mbgl/gl/renderer_backend.cpp +++ b/src/mbgl/gl/renderer_backend.cpp @@ -17,8 +17,7 @@ std::unique_ptr RendererBackend::createContext() { result->enableDebugging(); result->initializeExtensions( std::bind(&RendererBackend::getExtensionFunctionPointer, this, std::placeholders::_1)); - // Needs move to placate GCC 4.9 - return std::move(result); + return result; } PremultipliedImage RendererBackend::readFramebuffer(const Size& size) { diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index 68aa8f5c7..48e2f9d5c 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -73,7 +73,7 @@ inline Immutable createLayout( layout->get() = layout->get(); } - return std::move(layout); + return layout; } } // namespace diff --git a/src/mbgl/style/conversion/layer.cpp b/src/mbgl/style/conversion/layer.cpp index 8f2966595..50401d167 100644 --- a/src/mbgl/style/conversion/layer.cpp +++ b/src/mbgl/style/conversion/layer.cpp @@ -92,7 +92,7 @@ optional> Converter>::operator()(c return nullopt; } - return std::move(layer); + return layer; } } // namespace conversion diff --git a/test/src/mbgl/test/stub_file_source.cpp b/test/src/mbgl/test/stub_file_source.cpp index f1fb79bea..85194404c 100644 --- a/test/src/mbgl/test/stub_file_source.cpp +++ b/test/src/mbgl/test/stub_file_source.cpp @@ -60,7 +60,7 @@ std::unique_ptr StubFileSource::request(const Resource& resource, } else { pending.emplace(req.get(), std::make_tuple(resource, response, callback)); } - return std::move(req); + return req; } void StubFileSource::remove(AsyncRequest* req) {