diff options
Diffstat (limited to 'arm_compute')
-rw-r--r-- | arm_compute/core/CL/CLHelpers.h | 5 | ||||
-rw-r--r-- | arm_compute/core/Helpers.h | 40 | ||||
-rw-r--r-- | arm_compute/runtime/Array.h | 4 |
3 files changed, 5 insertions, 44 deletions
diff --git a/arm_compute/core/CL/CLHelpers.h b/arm_compute/core/CL/CLHelpers.h index 26253e3f38..7b3af33fee 100644 --- a/arm_compute/core/CL/CLHelpers.h +++ b/arm_compute/core/CL/CLHelpers.h @@ -26,6 +26,7 @@ #include "arm_compute/core/CL/OpenCL.h" #include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <string> @@ -70,7 +71,7 @@ const std::string &string_from_target(GPUTarget target); template <typename Kernel, typename... T> std::unique_ptr<Kernel> create_configure_kernel(T &&... args) { - std::unique_ptr<Kernel> k = arm_compute::cpp14::make_unique<Kernel>(); + std::unique_ptr<Kernel> k = arm_compute::support::cpp14::make_unique<Kernel>(); k->configure(std::forward<T>(args)...); return k; } @@ -82,7 +83,7 @@ std::unique_ptr<Kernel> create_configure_kernel(T &&... args) template <typename Kernel> std::unique_ptr<Kernel> create_kernel() { - std::unique_ptr<Kernel> k = arm_compute::cpp14::make_unique<Kernel>(); + std::unique_ptr<Kernel> k = arm_compute::support::cpp14::make_unique<Kernel>(); return k; } diff --git a/arm_compute/core/Helpers.h b/arm_compute/core/Helpers.h index 07318eaf7a..dfcca96eec 100644 --- a/arm_compute/core/Helpers.h +++ b/arm_compute/core/Helpers.h @@ -46,46 +46,6 @@ class IKernel; class ITensor; class ITensorInfo; -namespace cpp14 -{ -template <class T> -struct _Unique_if -{ - typedef std::unique_ptr<T> _Single_object; -}; - -template <class T> -struct _Unique_if<T[]> -{ - typedef std::unique_ptr<T[]> _Unknown_bound; -}; - -template <class T, size_t N> -struct _Unique_if<T[N]> -{ - typedef void _Known_bound; -}; - -template <class T, class... Args> -typename _Unique_if<T>::_Single_object -make_unique(Args &&... args) -{ - return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); -} - -template <class T> -typename _Unique_if<T>::_Unknown_bound -make_unique(size_t n) -{ - typedef typename std::remove_extent<T>::type U; - return std::unique_ptr<T>(new U[n]()); -} - -template <class T, class... Args> -typename _Unique_if<T>::_Known_bound -make_unique(Args &&...) = delete; -} - template <typename T> struct enable_bitwise_ops { diff --git a/arm_compute/runtime/Array.h b/arm_compute/runtime/Array.h index c8a240e428..61e0953edd 100644 --- a/arm_compute/runtime/Array.h +++ b/arm_compute/runtime/Array.h @@ -24,9 +24,9 @@ #ifndef __ARM_COMPUTE_ARRAY_H__ #define __ARM_COMPUTE_ARRAY_H__ -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/IArray.h" #include "arm_compute/core/Types.h" +#include "support/ToolchainSupport.h" #include <memory> @@ -47,7 +47,7 @@ public: * @param[in] max_num_values Maximum number of values the array will be able to stored */ Array(size_t max_num_values) - : IArray<T>(max_num_values), _values(arm_compute::cpp14::make_unique<T[]>(max_num_values)) + : IArray<T>(max_num_values), _values(arm_compute::support::cpp14::make_unique<T[]>(max_num_values)) { } |