From 6d72ec7fd137ac583e90e6ed6bcf3a1314c52b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Fri, 10 Jul 2020 22:01:30 +0200
Subject: [PATCH] Removed unnecessary qualified lookup from unit tests
---
.../Containers/VectorBinaryOperationsTest.h | 48 ++++++++++---------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/UnitTests/Containers/VectorBinaryOperationsTest.h b/src/UnitTests/Containers/VectorBinaryOperationsTest.h
index e438d649fc..d097984537 100644
--- a/src/UnitTests/Containers/VectorBinaryOperationsTest.h
+++ b/src/UnitTests/Containers/VectorBinaryOperationsTest.h
@@ -655,46 +655,50 @@ TYPED_TEST( VectorBinaryOperationsTest, min )
{
SETUP_BINARY_TEST_ALIASES;
-// FIXME: does not work without TNL::, because std::min conflicts (why?!)
+ // make sure we are testing TNL::min and not std::min (which might take precedence when
+ // both arguments have the same type, see https://stackoverflow.com/q/62847698/4180822
+ using TNL::min;
// with vector or vector view
- EXPECT_EQ( TNL::min(L1, R2), L1 );
+ EXPECT_EQ( min(L1, R2), L1 );
// with scalar
- EXPECT_EQ( TNL::min(L1, 2), L1 );
- EXPECT_EQ( TNL::min(1, R2), L1 );
+ EXPECT_EQ( min(L1, 2), L1 );
+ EXPECT_EQ( min(1, R2), L1 );
// with expression
- EXPECT_EQ( TNL::min(L1, R1 + R1), L1 );
- EXPECT_EQ( TNL::min(L1 + L1, R1), R1 );
+ EXPECT_EQ( min(L1, R1 + R1), L1 );
+ EXPECT_EQ( min(L1 + L1, R1), R1 );
// with two expressions
- EXPECT_EQ( TNL::min(L1 + L1, R1 + R2), L2 );
+ EXPECT_EQ( min(L1 + L1, R1 + R2), L2 );
// with expression and scalar
- EXPECT_EQ( TNL::min(L1 + L1, 1), L1 );
- EXPECT_EQ( TNL::min(L1 + L1, RightReal(1)), L1 );
- EXPECT_EQ( TNL::min(1, R1 + R1), L1 );
- EXPECT_EQ( TNL::min(LeftReal(1), R1 + R1), L1 );
+ EXPECT_EQ( min(L1 + L1, 1), L1 );
+ EXPECT_EQ( min(L1 + L1, RightReal(1)), L1 );
+ EXPECT_EQ( min(1, R1 + R1), L1 );
+ EXPECT_EQ( min(LeftReal(1), R1 + R1), L1 );
}
TYPED_TEST( VectorBinaryOperationsTest, max )
{
SETUP_BINARY_TEST_ALIASES;
-// FIXME: does not work without TNL::, because std::min conflicts (why?!)
+ // make sure we are testing TNL::max and not std::max (which might take precedence when
+ // both arguments have the same type, see https://stackoverflow.com/q/62847698/4180822
+ using TNL::max;
// with vector or vector view
- EXPECT_EQ( TNL::max(L1, R2), R2 );
+ EXPECT_EQ( max(L1, R2), R2 );
// with scalar
- EXPECT_EQ( TNL::max(L1, 2), L2 );
- EXPECT_EQ( TNL::max(1, R2), L2 );
+ EXPECT_EQ( max(L1, 2), L2 );
+ EXPECT_EQ( max(1, R2), L2 );
// with expression
- EXPECT_EQ( TNL::max(L1, R1 + R1), L2 );
- EXPECT_EQ( TNL::max(L1 + L1, R1), R2 );
+ EXPECT_EQ( max(L1, R1 + R1), L2 );
+ EXPECT_EQ( max(L1 + L1, R1), R2 );
// with two expressions
- EXPECT_EQ( TNL::max(L1 - L1, R1 + R1), L2 );
+ EXPECT_EQ( max(L1 - L1, R1 + R1), L2 );
// with expression and scalar
- EXPECT_EQ( TNL::max(L1 + L1, 1), L2 );
- EXPECT_EQ( TNL::max(L1 + L1, RightReal(1)), L2 );
- EXPECT_EQ( TNL::max(1, R1 + R1), L2 );
- EXPECT_EQ( TNL::max(LeftReal(1), R1 + R1), L2 );
+ EXPECT_EQ( max(L1 + L1, 1), L2 );
+ EXPECT_EQ( max(L1 + L1, RightReal(1)), L2 );
+ EXPECT_EQ( max(1, R1 + R1), L2 );
+ EXPECT_EQ( max(LeftReal(1), R1 + R1), L2 );
}
#if defined(HAVE_CUDA) && !defined(STATIC_VECTOR)
--
GitLab