From f856396131bdacd1594e6a732cb9422f43d7e211 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Sun, 19 Apr 2020 21:10:12 +0300
Subject: [core] Fix -Werror={pessimizing,redundant}-move from GCC 9

---
 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 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.1