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/CLChannelCombine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime/CL/functions/CLChannelCombine.cpp') diff --git a/src/runtime/CL/functions/CLChannelCombine.cpp b/src/runtime/CL/functions/CLChannelCombine.cpp index 79a3676bd7..11605cf95e 100644 --- a/src/runtime/CL/functions/CLChannelCombine.cpp +++ b/src/runtime/CL/functions/CLChannelCombine.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLChannelCombine.h" #include "arm_compute/core/CL/kernels/CLChannelCombineKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include @@ -32,14 +32,14 @@ using namespace arm_compute; void CLChannelCombine::configure(const ICLTensor *plane0, const ICLTensor *plane1, const ICLTensor *plane2, const ICLTensor *plane3, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(plane0, plane1, plane2, plane3, output); _kernel = std::move(k); } void CLChannelCombine::configure(const ICLImage *plane0, const ICLImage *plane1, const ICLImage *plane2, ICLMultiImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(plane0, plane1, plane2, output); _kernel = std::move(k); } -- cgit v1.2.1