diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-13 15:13:37 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-13 15:13:37 (GMT) |
| commit | af463c43ac22279239c1b8065ded7026b9224de1 (patch) | |
| tree | c28fdbabdd33d3153ac0ab86ec4e9e9ff57dc46a /googlemock/test/gmock-actions_test.cc | |
| parent | cf9d6344d28020b70c634c898fe798c862148668 (diff) | |
| download | googletest-af463c43ac22279239c1b8065ded7026b9224de1.zip googletest-af463c43ac22279239c1b8065ded7026b9224de1.tar.gz googletest-af463c43ac22279239c1b8065ded7026b9224de1.tar.bz2 | |
More merges, removing old dead code
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 9447c22..0128663 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -218,7 +218,7 @@ class MyNonDefaultConstructible { int value_; }; -#if GTEST_HAS_STD_TYPE_TRAITS_ +#if GTEST_LANG_CXX11 TEST(BuiltInDefaultValueTest, ExistsForDefaultConstructibleType) { EXPECT_TRUE(BuiltInDefaultValue<MyDefaultConstructible>::Exists()); @@ -228,7 +228,7 @@ TEST(BuiltInDefaultValueTest, IsDefaultConstructedForDefaultConstructibleType) { EXPECT_EQ(42, BuiltInDefaultValue<MyDefaultConstructible>::Get().value()); } -#endif // GTEST_HAS_STD_TYPE_TRAITS_ +#endif // GTEST_LANG_CXX11 TEST(BuiltInDefaultValueTest, DoesNotExistForNonDefaultConstructibleType) { EXPECT_FALSE(BuiltInDefaultValue<MyNonDefaultConstructible>::Exists()); |