diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-11-10 17:47:45 -0500 |
|---|---|---|
| committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-11-10 17:47:45 -0500 |
| commit | 5bd7c2b589e3cef554496fce85236de7be3e62db (patch) | |
| tree | 631d4919bea349b58146df3d649e3771b1f34953 /googlemock/test/gmock-actions_test.cc | |
| parent | cf517375efb5581dc0f187275ebce964c34e4a3f (diff) | |
| parent | a0435dc6879c336ab29afd64c380995055d2cd53 (diff) | |
| download | googletest-5bd7c2b589e3cef554496fce85236de7be3e62db.tar.gz googletest-5bd7c2b589e3cef554496fce85236de7be3e62db.tar.bz2 googletest-5bd7c2b589e3cef554496fce85236de7be3e62db.zip | |
Merge pull request #611 from mark-chromium/gmock_cxx11
googlemock: Support C++11 language with pre-C++11 library
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index a665fc5f..f470de4c 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -214,7 +214,7 @@ class MyNonDefaultConstructible { int value_; }; -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_TYPE_TRAITS_ TEST(BuiltInDefaultValueTest, ExistsForDefaultConstructibleType) { EXPECT_TRUE(BuiltInDefaultValue<MyDefaultConstructible>::Exists()); @@ -224,7 +224,7 @@ TEST(BuiltInDefaultValueTest, IsDefaultConstructedForDefaultConstructibleType) { EXPECT_EQ(42, BuiltInDefaultValue<MyDefaultConstructible>::Get().value()); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_TYPE_TRAITS_ TEST(BuiltInDefaultValueTest, DoesNotExistForNonDefaultConstructibleType) { EXPECT_FALSE(BuiltInDefaultValue<MyNonDefaultConstructible>::Exists()); |