From d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Thu, 29 Jun 2017 14:51:57 +0100 Subject: COMPMID-417: Extract common toolchain support file The support file is needed as Android toolchains are missing some C++11 functions. It further includes functions that have been introduced in C++14 but which we already need. Eventually the support file might become unnecessary if the Android compilers improve and we switch to C++14. Change-Id: Ib5ec506f1a17c78149c315ab2096b901b852c180 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79247 Reviewed-by: Georgios Pinitas Tested-by: Kaizen Reviewed-by: Pablo Tello --- src/runtime/CL/functions/CLColorConvert.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/runtime/CL/functions/CLColorConvert.cpp') diff --git a/src/runtime/CL/functions/CLColorConvert.cpp b/src/runtime/CL/functions/CLColorConvert.cpp index 2fe465aeb8..65f8ac3740 100644 --- a/src/runtime/CL/functions/CLColorConvert.cpp +++ b/src/runtime/CL/functions/CLColorConvert.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLColorConvert.h" #include "arm_compute/core/CL/kernels/CLColorConvertKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include @@ -32,28 +32,28 @@ using namespace arm_compute; void CLColorConvert::configure(const ICLTensor *input, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } void CLColorConvert::configure(const ICLImage *input, ICLMultiImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } void CLColorConvert::configure(const ICLMultiImage *input, ICLImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } void CLColorConvert::configure(const ICLMultiImage *input, ICLMultiImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } -- cgit v1.2.1