diff options
| author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-06-29 14:51:57 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade (patch) | |
| tree | e4b035d01add61c37fcbeaf38a6a54e550235d8f /src/runtime/NEON/functions/NELaplacianPyramid.cpp | |
| parent | 5cb4c42cb5d781a44409ebc97a408e1379ce182d (diff) | |
| download | ComputeLibrary-d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade.tar.gz | |
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 <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NELaplacianPyramid.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NELaplacianPyramid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/NEON/functions/NELaplacianPyramid.cpp b/src/runtime/NEON/functions/NELaplacianPyramid.cpp index 8232c79f2d..ec93759869 100644 --- a/src/runtime/NEON/functions/NELaplacianPyramid.cpp +++ b/src/runtime/NEON/functions/NELaplacianPyramid.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NELaplacianPyramid.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/NEON/functions/NEGaussian5x5.h" #include "arm_compute/runtime/NEON/functions/NEGaussianPyramid.h" #include "arm_compute/runtime/Tensor.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -86,8 +86,8 @@ void NELaplacianPyramid::configure(const ITensor *input, IPyramid *pyramid, ITen // Create Gaussian Pyramid function _gaussian_pyr_function.configure(input, &_gauss_pyr, border_mode, constant_border_value); - _convf = arm_compute::cpp14::make_unique<NEGaussian5x5[]>(_num_levels); - _subf = arm_compute::cpp14::make_unique<NEArithmeticSubtraction[]>(_num_levels); + _convf = arm_compute::support::cpp14::make_unique<NEGaussian5x5[]>(_num_levels); + _subf = arm_compute::support::cpp14::make_unique<NEArithmeticSubtraction[]>(_num_levels); for(unsigned int i = 0; i < _num_levels; ++i) { |