diff --git a/test/packetmath.cpp b/test/packetmath.cpp index 4cf697764..213090c1f 100644 --- a/test/packetmath.cpp +++ b/test/packetmath.cpp @@ -17,7 +17,6 @@ template void packetmath() { - using std::abs; typedef internal::packet_traits PacketTraits; const int PacketSize = internal::unpacket_traits::size; typedef typename NumTraits::Real RealScalar; @@ -39,7 +38,7 @@ template void packetmath() { data1[i] = internal::random()/RealScalar(PacketSize); data2[i] = internal::random()/RealScalar(PacketSize); - refvalue = (std::max)(refvalue,abs(data1[i])); + refvalue = (std::max)(refvalue, numext::abs(data1[i])); } internal::pstore(data2, internal::pload(data1)); @@ -325,7 +324,6 @@ template void packetmath() template void packetmath_real() { - using std::abs; typedef internal::packet_traits PacketTraits; const int PacketSize = internal::unpacket_traits::size; @@ -538,7 +536,6 @@ template void packetmath_real() template void packetmath_notcomplex() { - using std::abs; typedef internal::packet_traits PacketTraits; const int PacketSize = internal::unpacket_traits::size; @@ -558,7 +555,7 @@ template void packetmath_notcomplex() CHECK_CWISE2_IF(PacketTraits::HasMin, (std::min), internal::pmin); CHECK_CWISE2_IF(PacketTraits::HasMax, (std::max), internal::pmax); - CHECK_CWISE1(abs, internal::pabs); + CHECK_CWISE1(numext::abs, internal::pabs); ref[0] = data1[0]; for (int i=0; i::run() ); CALL_SUBTEST_2( test::runner::run() ); - CALL_SUBTEST_3( test::runner::run() ); - CALL_SUBTEST_4( test::runner >::run() ); - CALL_SUBTEST_5( test::runner >::run() ); - CALL_SUBTEST_6(( packetmath::type>() )); + CALL_SUBTEST_3( test::runner::run() ); + CALL_SUBTEST_4( test::runner::run() ); + CALL_SUBTEST_5( test::runner::run() ); + CALL_SUBTEST_6( test::runner::run() ); + CALL_SUBTEST_7( test::runner::run() ); + CALL_SUBTEST_8( test::runner::run() ); + CALL_SUBTEST_9( test::runner::run() ); + CALL_SUBTEST_10( test::runner::run() ); + CALL_SUBTEST_11( test::runner >::run() ); + CALL_SUBTEST_12( test::runner >::run() ); + CALL_SUBTEST_13(( packetmath::type>() )); g_first_pass = false; } }