Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit f856396

Browse files
committed
[core] Fix -Werror={pessimizing,redundant}-move from GCC 9
1 parent ad543e4 commit f856396

File tree

10 files changed

+10
-13
lines changed

10 files changed

+10
-13
lines changed

Diff for: platform/default/src/mbgl/storage/asset_file_source.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ std::unique_ptr<AsyncRequest> AssetFileSource::request(const Resource& resource,
5151

5252
impl->actor().invoke(&Impl::request, resource.url, req->actor());
5353

54-
return std::move(req);
54+
return req;
5555
}
5656

5757
bool AssetFileSource::canRequest(const Resource& resource) const {

Diff for: platform/default/src/mbgl/storage/database_file_source.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ DatabaseFileSource::~DatabaseFileSource() = default;
175175
std::unique_ptr<AsyncRequest> DatabaseFileSource::request(const Resource& resource, Callback callback) {
176176
auto req = std::make_unique<FileSourceRequest>(std::move(callback));
177177
impl->actor().invoke(&DatabaseFileSourceThread::request, resource, req->actor());
178-
return std::move(req);
178+
return req;
179179
}
180180

181181
void DatabaseFileSource::forward(const Resource& res, const Response& response, std::function<void()> callback) {

Diff for: platform/default/src/mbgl/storage/local_file_source.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ std::unique_ptr<AsyncRequest> LocalFileSource::request(const Resource& resource,
4747

4848
impl->actor().invoke(&Impl::request, resource.url, req->actor());
4949

50-
return std::move(req);
50+
return req;
5151
}
5252

5353
bool LocalFileSource::canRequest(const Resource& resource) const {

Diff for: platform/default/src/mbgl/storage/main_resource_loader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class MainResourceLoader::Impl {
151151
actorRef.invoke(&MainResourceLoaderThread::cancel, req);
152152
});
153153
thread->actor().invoke(&MainResourceLoaderThread::request, req.get(), resource, req->actor());
154-
return std::move(req);
154+
return req;
155155
}
156156

157157
bool canRequest(const Resource& resource) const {

Diff for: platform/default/src/mbgl/storage/online_file_source.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ class OnlineFileSource::Impl {
302302
req->onCancel(
303303
[actorRef = thread->actor(), req = req.get()]() { actorRef.invoke(&OnlineFileSourceThread::cancel, req); });
304304
thread->actor().invoke(&OnlineFileSourceThread::request, req.get(), std::move(res), req->actor());
305-
return std::move(req);
305+
return req;
306306
}
307307

308308
void pause() { thread->pause(); }

Diff for: src/mbgl/gl/program.hpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ class Program final : public gfx::Program<Name> {
7272
(programs::gl::shaderSource() + programs::gl::fragmentPreludeOffset),
7373
(programs::gl::shaderSource() + fragmentOffset)
7474
};
75-
auto result = std::make_unique<Instance>(context, vertexSource, fragmentSource);
76-
77-
return std::move(result);
75+
return std::make_unique<Instance>(context, vertexSource, fragmentSource);
7876
}
7977

8078
UniqueProgram program;

Diff for: src/mbgl/gl/renderer_backend.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ std::unique_ptr<gfx::Context> RendererBackend::createContext() {
1717
result->enableDebugging();
1818
result->initializeExtensions(
1919
std::bind(&RendererBackend::getExtensionFunctionPointer, this, std::placeholders::_1));
20-
// Needs move to placate GCC 4.9
21-
return std::move(result);
20+
return result;
2221
}
2322

2423
PremultipliedImage RendererBackend::readFramebuffer(const Size& size) {

Diff for: src/mbgl/layout/symbol_layout.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ inline Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> createLayout(
7373
layout->get<IconPitchAlignment>() = layout->get<IconRotationAlignment>();
7474
}
7575

76-
return std::move(layout);
76+
return layout;
7777
}
7878

7979
} // namespace

Diff for: src/mbgl/style/conversion/layer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ optional<std::unique_ptr<Layer>> Converter<std::unique_ptr<Layer>>::operator()(c
9292
return nullopt;
9393
}
9494

95-
return std::move(layer);
95+
return layer;
9696
}
9797

9898
} // namespace conversion

Diff for: test/src/mbgl/test/stub_file_source.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ std::unique_ptr<AsyncRequest> StubFileSource::request(const Resource& resource,
6060
} else {
6161
pending.emplace(req.get(), std::make_tuple(resource, response, callback));
6262
}
63-
return std::move(req);
63+
return req;
6464
}
6565

6666
void StubFileSource::remove(AsyncRequest* req) {

0 commit comments

Comments
 (0)