diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-06-14 12:35:24 +0100 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2019-06-14 14:27:23 +0000 |
| commit | db48288f54ad441f34108cf270ed3089d3a465ea (patch) | |
| tree | 08372fd4ef909dc161212f09c90a010adaf398a4 /src/armnn/test/CreateWorkload.hpp | |
| parent | 24d7321ad7897e8836d4a38039a73a0ec419cf43 (diff) | |
| download | armnn-db48288f54ad441f34108cf270ed3089d3a465ea.tar.gz | |
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>
Diffstat (limited to 'src/armnn/test/CreateWorkload.hpp')
| -rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } } |