diff options
| author | billydonahue <billydonahue@google.com> | 2014-05-19 17:54:51 +0000 |
|---|---|---|
| committer | billydonahue <billydonahue@google.com> | 2014-05-19 17:54:51 +0000 |
| commit | 1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01 (patch) | |
| tree | f05cabf6742496f8709c9df23aae8b8d002ea08f /test/gmock-internal-utils_test.cc | |
| parent | bd0188320de5aab1b09718e2c466387099d43cfb (diff) | |
| download | googletest-1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01.tar.gz googletest-1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01.tar.bz2 googletest-1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01.zip | |
Push several shanges:
Make single argument constructors explicit in macros.
Remove NOMINMAX macro.
Add macros for disabling Microsoft Visual C++ warnings.
Add WhenDynamicCastTo<T> matcher.
A matcher that matches a pointer that matches inner_matcher when
dynamic_cast<T> is applied.
Add IWYU export pragmas to the tuple include lines.
Fix NativeArray to not require a copy constructor unless we ask for one.
This allows ElementsAre() to support non-copyable types.
Examine WINAPI_FAMILY_PARTITION macros to better distinguish windows platforms.
Author: martin@martin.st
From: https://codereview.appspot.com/57220043/
Diffstat (limited to 'test/gmock-internal-utils_test.cc')
| -rw-r--r-- | test/gmock-internal-utils_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc index e5e842a1..95a7dc39 100644 --- a/test/gmock-internal-utils_test.cc +++ b/test/gmock-internal-utils_test.cc @@ -247,9 +247,9 @@ TEST(LosslessArithmeticConvertibleTest, FloatingPointToFloatingPoint) { // Larger size => smaller size is not fine. EXPECT_FALSE((LosslessArithmeticConvertible<double, float>::value)); - GTEST_INTENTIONAL_CONST_COND_PUSH_ + GTEST_INTENTIONAL_CONST_COND_PUSH_() if (sizeof(double) == sizeof(long double)) { // NOLINT - GTEST_INTENTIONAL_CONST_COND_POP_ + 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)); |