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/NEHistogram.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime/NEON/functions/NEHistogram.cpp') diff --git a/src/runtime/NEON/functions/NEHistogram.cpp b/src/runtime/NEON/functions/NEHistogram.cpp index c42b2a56e0..f333ecb1f8 100644 --- a/src/runtime/NEON/functions/NEHistogram.cpp +++ b/src/runtime/NEON/functions/NEHistogram.cpp @@ -24,17 +24,17 @@ #include "arm_compute/runtime/NEON/functions/NEHistogram.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/IDistribution1D.h" #include "arm_compute/core/ITensor.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; NEHistogram::NEHistogram() - : _histogram_kernel(), _local_hist(), _window_lut(arm_compute::cpp14::make_unique(window_lut_default_size)), _local_hist_size(0) + : _histogram_kernel(), _local_hist(), _window_lut(arm_compute::support::cpp14::make_unique(window_lut_default_size)), _local_hist_size(0) { } @@ -45,7 +45,7 @@ void NEHistogram::configure(const IImage *input, IDistribution1D *output) // Allocate space for threads local histograms _local_hist_size = output->num_bins() * NEScheduler::get().num_threads(); - _local_hist = arm_compute::cpp14::make_unique(_local_hist_size); + _local_hist = arm_compute::support::cpp14::make_unique(_local_hist_size); // Configure kernel _histogram_kernel.configure(input, output, _local_hist.get(), _window_lut.get()); -- cgit v1.2.1