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/CLLaplacianPyramid.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime/CL/functions/CLLaplacianPyramid.cpp') diff --git a/src/runtime/CL/functions/CLLaplacianPyramid.cpp b/src/runtime/CL/functions/CLLaplacianPyramid.cpp index d7ce20653d..3fc93426ee 100644 --- a/src/runtime/CL/functions/CLLaplacianPyramid.cpp +++ b/src/runtime/CL/functions/CLLaplacianPyramid.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/CL/functions/CLLaplacianPyramid.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/IPyramid.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" @@ -33,6 +32,7 @@ #include "arm_compute/runtime/CL/functions/CLDepthConvert.h" #include "arm_compute/runtime/CL/functions/CLGaussian5x5.h" #include "arm_compute/runtime/CL/functions/CLGaussianPyramid.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -64,8 +64,8 @@ void CLLaplacianPyramid::configure(ICLTensor *input, CLPyramid *pyramid, ICLTens // Create Gaussian Pyramid function _gaussian_pyr_function.configure(input, &_gauss_pyr, border_mode, constant_border_value); - _convf = arm_compute::cpp14::make_unique(_num_levels); - _subf = arm_compute::cpp14::make_unique(_num_levels); + _convf = arm_compute::support::cpp14::make_unique(_num_levels); + _subf = arm_compute::support::cpp14::make_unique(_num_levels); for(unsigned int i = 0; i < _num_levels; ++i) { -- cgit v1.2.1