Commits

ko...@google.com@8415998a-534a-0410-bf83-d39667b30386  committed 4118c9f

Suppress "Conditional expression is constant" warning on Visual Studio.

  • Participants
  • Parent commits e48419a

Comments (0)

Files changed (2)

File test/gmock-generated-actions_test.cc

 // 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);

File test/gmock-internal-utils_test.cc

 
   // 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));