diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2022-05-16 12:04:58 +0100 |
---|---|---|
committer | Colm Donelan <colm.donelan@arm.com> | 2022-05-16 16:59:36 +0000 |
commit | 9734f0911cdf68e1a7ba8b38167bb958436bc708 (patch) | |
tree | 0e135b99267399fc6e71334abeacacdcfa198ea5 | |
parent | b4dd5cc86d4eb841de670f0f102ede599e0d9c40 (diff) | |
download | armnn-9734f0911cdf68e1a7ba8b38167bb958436bc708.tar.gz |
Github issue #643 remove use of deprecated standard templates
Remove use of std::unary_function and std::binary_function which were
deprecated in C+11.
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
Change-Id: I9e4624f570b475595c9e28bdf185ddcc2ddceb2f
-rw-r--r-- | src/backends/reference/workloads/Abs.hpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/Exp.hpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/Log.hpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/Maximum.hpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/Minimum.hpp | 5 | ||||
-rw-r--r-- | src/backends/reference/workloads/Rsqrt.hpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/Sin.hpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/Sqrt.hpp | 7 |
8 files changed, 39 insertions, 15 deletions
diff --git a/src/backends/reference/workloads/Abs.hpp b/src/backends/reference/workloads/Abs.hpp index b05f2e3367..60616671ec 100644 --- a/src/backends/reference/workloads/Abs.hpp +++ b/src/backends/reference/workloads/Abs.hpp @@ -9,9 +9,12 @@ namespace armnn { - template<typename T> -struct abs : public std::unary_function<T, T> +template<typename T> +struct abs { + typedef T result_type; + typedef T argument_type; + T operator () (const T& inputData) const { diff --git a/src/backends/reference/workloads/Exp.hpp b/src/backends/reference/workloads/Exp.hpp index 1a046728ba..9440bf6755 100644 --- a/src/backends/reference/workloads/Exp.hpp +++ b/src/backends/reference/workloads/Exp.hpp @@ -9,9 +9,12 @@ namespace armnn { - template<typename T> -struct exp : public std::unary_function<T, T> +template<typename T> +struct exp { + typedef T result_type; + typedef T argument_type; + T operator () (const T& inputData) const { diff --git a/src/backends/reference/workloads/Log.hpp b/src/backends/reference/workloads/Log.hpp index 98b6b824cc..46c04d9be4 100644 --- a/src/backends/reference/workloads/Log.hpp +++ b/src/backends/reference/workloads/Log.hpp @@ -9,9 +9,12 @@ namespace armnn { - template<typename T> -struct log : public std::unary_function<T, T> +template<typename T> +struct log { + typedef T result_type; + typedef T argument_type; + T operator () (const T& inputData) const { diff --git a/src/backends/reference/workloads/Maximum.hpp b/src/backends/reference/workloads/Maximum.hpp index 97df19d3c6..ca4b480b51 100644 --- a/src/backends/reference/workloads/Maximum.hpp +++ b/src/backends/reference/workloads/Maximum.hpp @@ -9,9 +9,12 @@ namespace armnn { - template<typename T> -struct maximum : public std::binary_function<T, T, T> +template<typename T> +struct maximum { + typedef T result_type; + typedef T first_argument_type; + T operator () (const T& inputData0, const T& inputData1) const { diff --git a/src/backends/reference/workloads/Minimum.hpp b/src/backends/reference/workloads/Minimum.hpp index 0c053981a0..f1422773ba 100644 --- a/src/backends/reference/workloads/Minimum.hpp +++ b/src/backends/reference/workloads/Minimum.hpp @@ -9,8 +9,11 @@ namespace armnn { template<typename T> -struct minimum : public std::binary_function<T, T, T> +struct minimum { + typedef T result_type; + typedef T first_argument_type; + T operator()(const T& input1, const T& input2) const { diff --git a/src/backends/reference/workloads/Rsqrt.hpp b/src/backends/reference/workloads/Rsqrt.hpp index 47ebcf36f6..1b8e6c3c74 100644 --- a/src/backends/reference/workloads/Rsqrt.hpp +++ b/src/backends/reference/workloads/Rsqrt.hpp @@ -9,9 +9,12 @@ namespace armnn { - template<typename T> -struct rsqrt : public std::unary_function<T, T> +template<typename T> +struct rsqrt { + typedef T result_type; + typedef T argument_type; + T operator () (const T& inputData) const { diff --git a/src/backends/reference/workloads/Sin.hpp b/src/backends/reference/workloads/Sin.hpp index b71c33bbf3..8ff78b4e8a 100644 --- a/src/backends/reference/workloads/Sin.hpp +++ b/src/backends/reference/workloads/Sin.hpp @@ -9,9 +9,12 @@ namespace armnn { - template<typename T> -struct sin : public std::unary_function<T, T> +template<typename T> +struct sin { + typedef T result_type; + typedef T argument_type; + T operator () (const T& inputData) const { diff --git a/src/backends/reference/workloads/Sqrt.hpp b/src/backends/reference/workloads/Sqrt.hpp index e4ff6a4829..ae5afa7bdd 100644 --- a/src/backends/reference/workloads/Sqrt.hpp +++ b/src/backends/reference/workloads/Sqrt.hpp @@ -9,9 +9,12 @@ namespace armnn { - template<typename T> -struct sqrt : public std::unary_function<T, T> +template<typename T> +struct sqrt { + typedef T result_type; + typedef T argument_type; + T operator () (const T& inputData) const { |