diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-03-14 11:21:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 11:21:53 -0400 |
| commit | a325ad2db5deb623eab740527e559b81c0f39d65 (patch) | |
| tree | c4b677a27ad5ac69cf8d4a0b98b152259c4796d1 /googlemock/test/gmock-actions_test.cc | |
| parent | f35fe6de3b25671099de0bf69b016eed3832dc9e (diff) | |
| parent | 262aaf2f1dbf13df1aa0c303595b45981824fc8a (diff) | |
| download | googletest-a325ad2db5deb623eab740527e559b81c0f39d65.tar.gz googletest-a325ad2db5deb623eab740527e559b81c0f39d65.tar.bz2 googletest-a325ad2db5deb623eab740527e559b81c0f39d65.zip | |
Merge pull request #1504 from gennadiycivil/master
Merges
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 9447c22b..01286634 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()); |