From d56d94dff3b6fb1cc1807df19a8ead08c7f0faae Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Mon, 7 Feb 2022 16:19:55 +0000 Subject: Fix build for gcc 9 Resolves COMPMID-5127 Signed-off-by: Giorgio Arena Change-Id: I2b1eefdf5d9a58a13295b27f2d66e461d9b9289c Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7086 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Gunes Bayir --- SConstruct | 2 +- src/cpu/kernels/CpuKernelSelectionTypes.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index bae197c783..3266d34919 100644 --- a/SConstruct +++ b/SConstruct @@ -220,7 +220,7 @@ if 'clang++' in cpp_compiler: elif 'armclang' in cpp_compiler: pass else: - env.Append(CXXFLAGS = ['-Wlogical-op','-Wnoexcept','-Wstrict-null-sentinel']) + env.Append(CXXFLAGS = ['-Wlogical-op','-Wnoexcept','-Wstrict-null-sentinel', '-Wno-misleading-indentation']) if cpp_compiler == 'g++': # Don't strip comments that could include markers diff --git a/src/cpu/kernels/CpuKernelSelectionTypes.h b/src/cpu/kernels/CpuKernelSelectionTypes.h index 779fb86e6d..60dcea4a35 100644 --- a/src/cpu/kernels/CpuKernelSelectionTypes.h +++ b/src/cpu/kernels/CpuKernelSelectionTypes.h @@ -36,17 +36,17 @@ namespace kernels // Selector data types struct DataTypeISASelectorData { - DataType dt; - const cpuinfo::CpuIsaInfo &isa; + DataType dt; + cpuinfo::CpuIsaInfo isa; }; struct PoolDataTypeISASelectorData { - DataType dt; - DataLayout dl; - int pool_stride_x; - Size2D pool_size; - const cpuinfo::CpuIsaInfo &isa; + DataType dt; + DataLayout dl; + int pool_stride_x; + Size2D pool_size; + cpuinfo::CpuIsaInfo isa; }; // Selector pointer types -- cgit v1.2.1