From db48288f54ad441f34108cf270ed3089d3a465ea Mon Sep 17 00:00:00 2001
From: Mike Kelly <mike.kelly@arm.com>
Date: Fri, 14 Jun 2019 12:35:24 +0100
Subject: MLCE-121 Github: Build error on GCC 9

 * Fixed an error encountered when building on GCC 9
   error: moving a local object in a return statement prevents copy elision
 * Fixed failures in unit tests due to std::initializer_list handling in GCC 9

Change-Id: I4bfdd2113dfedcecd29479ee556e4ae22278755d
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
---
 src/armnn/test/CreateWorkload.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/armnn/test')

diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
index c4b191a29f..8863fecce3 100644
--- a/src/armnn/test/CreateWorkload.hpp
+++ b/src/armnn/test/CreateWorkload.hpp
@@ -1119,7 +1119,7 @@ std::unique_ptr<ConcatWorkload> CreateConcatWorkloadTest(armnn::IWorkloadFactory
     auto workloadConcat = MakeAndCheckWorkload<ConcatWorkload>(*concat, graph, factory);
     BOOST_TEST_CHECKPOINT("created concat workload");
 
-    return std::move(workloadConcat);
+    return workloadConcat;
 }
 
 template <typename PreCompiledWorkload, armnn::DataType dataType>
@@ -1277,7 +1277,7 @@ std::unique_ptr<ConstantWorkload> CreateConstantWorkloadTest(armnn::IWorkloadFac
     auto workloadConstant = MakeAndCheckWorkload<ConstantWorkload>(*constant, graph, factory);
     BOOST_TEST_CHECKPOINT("created Constant workload");
 
-    return std::move(workloadConstant);
+    return workloadConstant;
 }
 
 }
-- 
cgit v1.2.1