diff options
| -rw-r--r-- | test/gmock-generated-actions_test.cc | 2 | ||||
| -rw-r--r-- | test/gmock-internal-utils_test.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test/gmock-generated-actions_test.cc b/test/gmock-generated-actions_test.cc index 3181271..a1fa6ae 100644 --- a/test/gmock-generated-actions_test.cc +++ b/test/gmock-generated-actions_test.cc @@ -900,7 +900,9 @@ template <typename T1, typename T2> // pattern requires the user to use it directly. ConcatImplActionP3<std::string, T1, T2> Concat(const std::string& a, T1 b, T2 c) { + GTEST_INTENTIONAL_CONST_COND_PUSH_ if (true) { + GTEST_INTENTIONAL_CONST_COND_POP_ // This branch verifies that ConcatImpl() can be invoked without // explicit template arguments. return ConcatImpl(a, b, c); diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc index 3c78f64..b6a6644 100644 --- a/test/gmock-internal-utils_test.cc +++ b/test/gmock-internal-utils_test.cc @@ -250,7 +250,9 @@ TEST(LosslessArithmeticConvertibleTest, FloatingPointToFloatingPoint) { // Larger size => smaller size is not fine. EXPECT_FALSE((LosslessArithmeticConvertible<double, float>::value)); + GTEST_INTENTIONAL_CONST_COND_PUSH_ if (sizeof(double) == sizeof(long double)) { // NOLINT + GTEST_INTENTIONAL_CONST_COND_POP_ // In some implementations (e.g. MSVC), double and long double // have the same size. EXPECT_TRUE((LosslessArithmeticConvertible<long double, double>::value)); |