From 1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01 Mon Sep 17 00:00:00 2001 From: billydonahue Date: Mon, 19 May 2014 17:54:51 +0000 Subject: Push several shanges: Make single argument constructors explicit in macros. Remove NOMINMAX macro. Add macros for disabling Microsoft Visual C++ warnings. Add WhenDynamicCastTo matcher. A matcher that matches a pointer that matches inner_matcher when dynamic_cast 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/ --- test/gmock-internal-utils_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/gmock-internal-utils_test.cc') 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::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::value)); -- cgit v1.2.3