From 331fc74a80fff0797b98ade448885385b126bc4c Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Thu, 6 Jul 2017 11:47:06 +0100 Subject: COMPMID-421: Fixed compiler error for arm-v8.2-a. Change-Id: If4703e58becd244ce15c91dab2192eeccebcb835 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79900 Reviewed-by: Moritz Pflanzer Tested-by: Kaizen --- tests/validation/TensorOperations.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/validation/TensorOperations.h') diff --git a/tests/validation/TensorOperations.h b/tests/validation/TensorOperations.h index e90635f0d4..0d752ee6fc 100644 --- a/tests/validation/TensorOperations.h +++ b/tests/validation/TensorOperations.h @@ -518,7 +518,7 @@ void box3x3(const Tensor &in, Tensor &out, BorderMode border_mode, T const } // Depth conversion -template < typename T1, typename T2, typename std::enable_if < std::is_integral::value &&std::is_floating_point::value, int >::type = 0 > +template < typename T1, typename T2, typename std::enable_if < std::is_integral::value &&is_floating_point::value, int >::type = 0 > void depth_convert(const Tensor &in, Tensor &out, ConvertPolicy policy, uint32_t shift) { using namespace fixed_point_arithmetic; @@ -530,7 +530,7 @@ void depth_convert(const Tensor &in, Tensor &out, ConvertPolicy policy, } } -template < typename T1, typename T2, typename std::enable_if < std::is_floating_point::value &&std::is_integral::value, int >::type = 0 > +template < typename T1, typename T2, typename std::enable_if < is_floating_point::value &&std::is_integral::value, int >::type = 0 > void depth_convert(const Tensor &in, Tensor &out, ConvertPolicy policy, uint32_t shift) { using namespace fixed_point_arithmetic; @@ -564,7 +564,7 @@ void depth_convert(const Tensor &in, Tensor &out, ConvertPolicy policy, } } -template < typename T1, typename T2, typename std::enable_if < std::is_floating_point::value &&std::is_floating_point::value, int >::type = 0 > +template < typename T1, typename T2, typename std::enable_if < is_floating_point::value &&is_floating_point::value, int >::type = 0 > void depth_convert(const Tensor &in, Tensor &out, ConvertPolicy policy, uint32_t shift) { for(int i = 0; i < in.num_elements(); ++i) -- cgit v1.2.1