summaryrefslogtreecommitdiff
path: root/src
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 /src
parentad543e43556dc350b7c30f510439f85a3be424a6 (diff)
downloadqtlocation-mapboxgl-f856396131bdacd1594e6a732cb9422f43d7e211.tar.gz
[core] Fix -Werror={pessimizing,redundant}-move from GCC 9
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/gl/program.hpp4
-rw-r--r--src/mbgl/gl/renderer_backend.cpp3
-rw-r--r--src/mbgl/layout/symbol_layout.cpp2
-rw-r--r--src/mbgl/style/conversion/layer.cpp2
4 files changed, 4 insertions, 7 deletions
diff --git a/src/mbgl/gl/program.hpp b/src/mbgl/gl/program.hpp
index 6cfe05bf54..dbac6841f4 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<Instance>(context, vertexSource, fragmentSource);
-
- return std::move(result);
+ return std::make_unique<Instance>(context, vertexSource, fragmentSource);
}
UniqueProgram program;
diff --git a/src/mbgl/gl/renderer_backend.cpp b/src/mbgl/gl/renderer_backend.cpp
index fe0ca4b5b2..1f52ce06a9 100644
--- a/src/mbgl/gl/renderer_backend.cpp
+++ b/src/mbgl/gl/renderer_backend.cpp
@@ -17,8 +17,7 @@ std::unique_ptr<gfx::Context> 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 68aa8f5c7d..48e2f9d5c5 100644
--- a/src/mbgl/layout/symbol_layout.cpp
+++ b/src/mbgl/layout/symbol_layout.cpp
@@ -73,7 +73,7 @@ inline Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> createLayout(
layout->get<IconPitchAlignment>() = layout->get<IconRotationAlignment>();
}
- return std::move(layout);
+ return layout;
}
} // namespace
diff --git a/src/mbgl/style/conversion/layer.cpp b/src/mbgl/style/conversion/layer.cpp
index 8f29665957..50401d1679 100644
--- a/src/mbgl/style/conversion/layer.cpp
+++ b/src/mbgl/style/conversion/layer.cpp
@@ -92,7 +92,7 @@ optional<std::unique_ptr<Layer>> Converter<std::unique_ptr<Layer>>::operator()(c
return nullopt;
}
- return std::move(layer);
+ return layer;
}
} // namespace conversion