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/NEON/functions/NEWarpAffine.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/runtime/NEON/functions/NEWarpAffine.cpp') diff --git a/src/runtime/NEON/functions/NEWarpAffine.cpp b/src/runtime/NEON/functions/NEWarpAffine.cpp index 24fb16f9e3..889d827ed0 100644 --- a/src/runtime/NEON/functions/NEWarpAffine.cpp +++ b/src/runtime/NEON/functions/NEWarpAffine.cpp @@ -24,8 +24,9 @@ #include "arm_compute/runtime/NEON/functions/NEWarpAffine.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEWarpKernel.h" +#include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" #include @@ -41,14 +42,14 @@ void NEWarpAffine::configure(ITensor *input, ITensor *output, const float *matri { case InterpolationPolicy::NEAREST_NEIGHBOR: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input, output, matrix, border_mode, constant_border_value); _kernel = std::move(k); break; } case InterpolationPolicy::BILINEAR: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input, output, matrix, border_mode, constant_border_value); _kernel = std::move(k); break; -- cgit v1.2.1