From 40f51a63c8e7258db15269427ae4fe1ad199c550 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Sat, 21 Nov 2020 03:04:18 +0000 Subject: Update default C++ standard to C++14 (3RDPARTY_UPDATE) Resolves: COMPMID-3849 Signed-off-by: Georgios Pinitas Change-Id: I6369f112337310140e2d6c8e79630cd11138dfa0 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4544 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins --- arm_compute/runtime/Array.h | 3 +-- arm_compute/runtime/CL/tuners/CLLWSList.h | 8 ++++---- arm_compute/runtime/CL/tuners/Tuners.h | 6 ++---- arm_compute/runtime/MemoryRegion.h | 5 ++--- arm_compute/runtime/NEON/functions/NEQLSTMLayer.h | 3 +-- 5 files changed, 10 insertions(+), 15 deletions(-) (limited to 'arm_compute/runtime') diff --git a/arm_compute/runtime/Array.h b/arm_compute/runtime/Array.h index 817d97a64d..5b98b6c2bc 100644 --- a/arm_compute/runtime/Array.h +++ b/arm_compute/runtime/Array.h @@ -26,7 +26,6 @@ #include "arm_compute/core/IArray.h" #include "arm_compute/core/Types.h" -#include "support/MemorySupport.h" #include @@ -47,7 +46,7 @@ public: * @param[in] max_num_values Maximum number of values the array will be able to stored */ Array(size_t max_num_values) - : IArray(max_num_values), _values(arm_compute::support::cpp14::make_unique(max_num_values)) + : IArray(max_num_values), _values(std::make_unique(max_num_values)) { } diff --git a/arm_compute/runtime/CL/tuners/CLLWSList.h b/arm_compute/runtime/CL/tuners/CLLWSList.h index 48f3f3f7c9..fe63754dd0 100644 --- a/arm_compute/runtime/CL/tuners/CLLWSList.h +++ b/arm_compute/runtime/CL/tuners/CLLWSList.h @@ -30,7 +30,7 @@ #include "arm_compute/runtime/CL/CLTunerTypes.h" #include "support/ToolchainSupport.h" -#include "support/MemorySupport.h" +#include namespace arm_compute { @@ -199,11 +199,11 @@ public: switch(mode) { case CLTunerMode::EXHAUSTIVE: - return arm_compute::support::cpp14::make_unique(gws); + return std::make_unique(gws); case CLTunerMode::NORMAL: - return arm_compute::support::cpp14::make_unique(gws); + return std::make_unique(gws); case CLTunerMode::RAPID: - return arm_compute::support::cpp14::make_unique(gws); + return std::make_unique(gws); default: return nullptr; } diff --git a/arm_compute/runtime/CL/tuners/Tuners.h b/arm_compute/runtime/CL/tuners/Tuners.h index dd1c62a252..3ba9e0071d 100644 --- a/arm_compute/runtime/CL/tuners/Tuners.h +++ b/arm_compute/runtime/CL/tuners/Tuners.h @@ -27,8 +27,6 @@ #include "arm_compute/runtime/CL/tuners/BifrostTuner.h" #include "arm_compute/runtime/CL/tuners/MidgardTuner.h" -#include "support/MemorySupport.h" - #include namespace arm_compute @@ -45,9 +43,9 @@ public: switch(arch) { case GPUTarget::BIFROST: - return support::cpp14::make_unique(); + return std::make_unique(); case GPUTarget::MIDGARD: - return support::cpp14::make_unique(); + return std::make_unique(); default: return nullptr; } diff --git a/arm_compute/runtime/MemoryRegion.h b/arm_compute/runtime/MemoryRegion.h index 63feabd281..6408deceaa 100644 --- a/arm_compute/runtime/MemoryRegion.h +++ b/arm_compute/runtime/MemoryRegion.h @@ -27,7 +27,6 @@ #include "arm_compute/runtime/IMemoryRegion.h" #include "arm_compute/core/Error.h" -#include "support/MemorySupport.h" #include @@ -59,7 +58,7 @@ public: if(alignment != 0) { void *aligned_ptr = _mem.get(); - support::cpp11::align(alignment, size, aligned_ptr, space); + std::align(alignment, size, aligned_ptr, space); _ptr = aligned_ptr; } } @@ -94,7 +93,7 @@ public: { if(_ptr != nullptr && (offset < _size) && (_size - offset >= size)) { - return support::cpp14::make_unique(static_cast(_ptr) + offset, size); + return std::make_unique(static_cast(_ptr) + offset, size); } else { diff --git a/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h b/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h index fcabc1d0c4..e0054bceff 100644 --- a/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h +++ b/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h @@ -33,9 +33,8 @@ #include "arm_compute/runtime/NEON/functions/NEGEMMLowpOutputStage.h" #include "arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h" #include "arm_compute/runtime/NEON/functions/NETranspose.h" -#include "support/MemorySupport.h" - #include "arm_compute/runtime/common/LSTMParams.h" + #include namespace arm_compute -- cgit v1.2.1