From db48288f54ad441f34108cf270ed3089d3a465ea Mon Sep 17 00:00:00 2001 From: Mike Kelly 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 --- src/backends/neon/test/NeonCreateWorkloadTests.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/backends/neon') diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index 83823659b0..523588c50a 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -275,12 +275,10 @@ static void NeonCreateDepthWiseConvolutionWorkloadTest(DataLayout dataLayout) auto inputHandle = boost::polymorphic_downcast(queueDescriptor.m_Inputs[0]); auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); - std::initializer_list inputShape = (dataLayout == DataLayout::NCHW) - ? std::initializer_list({ 2, 2, 5, 5 }) - : std::initializer_list({ 2, 5, 5, 2 }); - std::initializer_list outputShape = (dataLayout == DataLayout::NCHW) - ? std::initializer_list({ 2, 2, 5, 5 }) - : std::initializer_list({ 2, 5, 5, 2 }); + TensorShape inputShape = (dataLayout == DataLayout::NCHW) ? std::initializer_list({ 2, 2, 5, 5 }) + : std::initializer_list({ 2, 5, 5, 2 }); + TensorShape outputShape = (dataLayout == DataLayout::NCHW) ? std::initializer_list({ 2, 2, 5, 5 }) + : std::initializer_list({ 2, 5, 5, 2 }); BOOST_TEST(TestNeonTensorHandleInfo(inputHandle, TensorInfo(inputShape, DataType))); BOOST_TEST(TestNeonTensorHandleInfo(outputHandle, TensorInfo(outputShape, DataType))); -- cgit v1.2.1