From 0b192e84510c006d87cee3c29f95511ad088b704 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 20 Feb 2020 17:09:28 +0000 Subject: COMPMID-3067: Address gcc9 failures Signed-off-by: Georgios Pinitas Change-Id: I048d1d7dda7edf587d37ce83a93b557d8a95754a Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2771 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- arm_compute/runtime/FunctionDescriptors.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'arm_compute/runtime/FunctionDescriptors.h') diff --git a/arm_compute/runtime/FunctionDescriptors.h b/arm_compute/runtime/FunctionDescriptors.h index d523c56907..3706d0859f 100644 --- a/arm_compute/runtime/FunctionDescriptors.h +++ b/arm_compute/runtime/FunctionDescriptors.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -44,8 +44,9 @@ struct FFT1DInfo /** Descriptor used by the FFT2D function */ struct FFT2DInfo { - std::pair axes{ 0, 1 }; /**< Axes to run on. If same, multiple transforms are performed on single axis*/ - FFTDirection direction{ FFTDirection::Forward }; /**< Direction of the FFT. */ + unsigned int axis0{ 0 }; /**< Axis to run first pass on. If same, multiple transforms are performed on single axis*/ + unsigned int axis1{ 1 }; /**< Axis to run second pass on. If same, multiple transforms are performed on single axis*/ + FFTDirection direction{ FFTDirection::Forward }; /**< Direction of the FFT. */ }; } // namespace arm_compute #endif /* ARM_COMPUTE_RUNTIME_FUNCTION_DESCRIPTORS_H */ -- cgit v1.2.1