From 40f51a63c8e7258db15269427ae4fe1ad199c550 Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
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 <georgios.pinitas@arm.com>
Change-Id: I6369f112337310140e2d6c8e79630cd11138dfa0
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4544
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
---
 tests/framework/instruments/Instrument.h       | 4 +---
 tests/framework/instruments/SchedulerTimer.cpp | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'tests/framework/instruments')

diff --git a/tests/framework/instruments/Instrument.h b/tests/framework/instruments/Instrument.h
index 4506460515..3ea15825ad 100644
--- a/tests/framework/instruments/Instrument.h
+++ b/tests/framework/instruments/Instrument.h
@@ -24,8 +24,6 @@
 #ifndef ARM_COMPUTE_TEST_INSTRUMENT
 #define ARM_COMPUTE_TEST_INSTRUMENT
 
-#include "support/MemorySupport.h"
-
 #include "../Utils.h"
 #include "Measurement.h"
 
@@ -135,7 +133,7 @@ protected:
 template <typename T, ScaleFactor scale>
 inline std::unique_ptr<Instrument> Instrument::make_instrument()
 {
-    return support::cpp14::make_unique<T>(scale);
+    return std::make_unique<T>(scale);
 }
 
 } // namespace framework
diff --git a/tests/framework/instruments/SchedulerTimer.cpp b/tests/framework/instruments/SchedulerTimer.cpp
index b4d1c597e7..c81b807c3e 100644
--- a/tests/framework/instruments/SchedulerTimer.cpp
+++ b/tests/framework/instruments/SchedulerTimer.cpp
@@ -188,7 +188,7 @@ void           SchedulerClock<output_timestamps>::test_start()
         {
             if(user != nullptr && user->scheduler() != nullptr)
             {
-                user->intercept_scheduler(support::cpp14::make_unique<Interceptor<output_timestamps>>(_kernels, *user->scheduler(), _scale_factor));
+                user->intercept_scheduler(std::make_unique<Interceptor<output_timestamps>>(_kernels, *user->scheduler(), _scale_factor));
             }
         });
     }
-- 
cgit v1.2.1