WIP: try fix gcc debug build by allowing a move over a copy

mapbox · Oct 23, 2019 · 31e0c64 · 31e0c64
1 parent ec31f15
commit 31e0c64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/mbgl/layermanager/fill_layer_factory.cpp b/src/mbgl/layermanager/fill_layer_factory.cpp
@@ -31,11 +31,11 @@ FillLayerFactory::createLayout(const LayoutParameters& parameters,
     using namespace style;
 
     using LayoutType = PatternLayout<FillBucket, FillLayerProperties, FillPattern, FillLayoutProperties>;
-    auto layout = std::make_unique<LayoutType>(parameters.bucketParameters, group, std::move(layer), parameters.imageDependencies);
+    auto&& layout = std::make_unique<LayoutType>(parameters.bucketParameters, group, std::move(layer), parameters.imageDependencies);
 
     layout->template maybeApplySortKey<FillSortKey>();
 
-    return layout;
+    return std::move(layout);
 }
 
 std::unique_ptr<RenderLayer> FillLayerFactory::createRenderLayer(Immutable<style::Layer::Impl> impl) noexcept {

diff --git a/src/mbgl/layermanager/line_layer_factory.cpp b/src/mbgl/layermanager/line_layer_factory.cpp
@@ -30,11 +30,11 @@ std::unique_ptr<Layout> LineLayerFactory::createLayout(const LayoutParameters& p
     using namespace style;
 
     using LayoutType = PatternLayout<LineBucket, LineLayerProperties, LinePattern, LineLayoutProperties>;
-    auto layout = std::make_unique<LayoutType>(parameters.bucketParameters, group, std::move(layer), parameters.imageDependencies);
+    auto&& layout = std::make_unique<LayoutType>(parameters.bucketParameters, group, std::move(layer), parameters.imageDependencies);
 
     layout->template maybeApplySortKey<LineSortKey>();
 
-    return layout;
+    return std::move(layout);
 }
 
 std::unique_ptr<RenderLayer> LineLayerFactory::createRenderLayer(Immutable<style::Layer::Impl> impl) noexcept {