From 6c62d7ae1e989ac04b139b45ee61a8a4650fc4fd Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Mon, 16 Nov 2020 16:34:06 +0000
Subject: COMPMID-3970: Failure when building with GCC < 6

Address pre-N4387 tuple usage

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Iefe6e08e27b8fe1e688d2ff9db8cb7e172b568f3
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4429
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
---
 src/core/NEON/kernels/arm_gemm/convolver.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/NEON/kernels/arm_gemm/convolver.hpp b/src/core/NEON/kernels/arm_gemm/convolver.hpp
index 1cd959523f..879d95f5bb 100644
--- a/src/core/NEON/kernels/arm_gemm/convolver.hpp
+++ b/src/core/NEON/kernels/arm_gemm/convolver.hpp
@@ -105,7 +105,7 @@ private:
 
             std::tuple<unsigned int, unsigned int> next_block(const T ** const row_ptr) {
                 if (finished()) {
-                    return { 0, 0 };
+                    return std::make_tuple(0, 0);
                 }
 
                 // "in_width" in the amount of data that will be read in (copied)
@@ -139,7 +139,7 @@ private:
                 m_current_pos++;
                 m_length_remaining-=out_width;
 
-                return { in_width, offset };
+                return std::make_tuple(in_width, offset);
             }
         }; // end of "row handler" class
 
-- 
cgit v1.2.1