summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2020-04-19 21:10:12 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2020-04-20 14:37:24 +0300
commitf856396131bdacd1594e6a732cb9422f43d7e211 (patch)
treea3539c289a084a14d68bd176110daed6fbba099e /platform
parentad543e43556dc350b7c30f510439f85a3be424a6 (diff)
downloadqtlocation-mapboxgl-f856396131bdacd1594e6a732cb9422f43d7e211.tar.gz
[core] Fix -Werror={pessimizing,redundant}-move from GCC 9
Diffstat (limited to 'platform')
-rw-r--r--platform/default/src/mbgl/storage/asset_file_source.cpp2
-rw-r--r--platform/default/src/mbgl/storage/database_file_source.cpp2
-rw-r--r--platform/default/src/mbgl/storage/local_file_source.cpp2
-rw-r--r--platform/default/src/mbgl/storage/main_resource_loader.cpp2
-rw-r--r--platform/default/src/mbgl/storage/online_file_source.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/platform/default/src/mbgl/storage/asset_file_source.cpp b/platform/default/src/mbgl/storage/asset_file_source.cpp
index 278411026e..9d1dba311a 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<AsyncRequest> 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 50c444274e..27424e1804 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<AsyncRequest> DatabaseFileSource::request(const Resource& resource, Callback callback) {
auto req = std::make_unique<FileSourceRequest>(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<void()> callback) {
diff --git a/platform/default/src/mbgl/storage/local_file_source.cpp b/platform/default/src/mbgl/storage/local_file_source.cpp
index 5d92e711a1..945e4b9164 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<AsyncRequest> 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 6dcb38b72b..1658ca4a59 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 aa854933db..a5274c6b38 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(); }