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-matchers_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-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index b09acba9..2ff5556d 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -1042,14 +1042,14 @@ TEST(IsNullTest, ReferenceToConstLinkedPtr) { EXPECT_FALSE(m.Matches(non_null_p)); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_FUNCTION_ TEST(IsNullTest, StdFunction) { const Matcher<std::function<void()>> m = IsNull(); EXPECT_TRUE(m.Matches(std::function<void()>())); EXPECT_FALSE(m.Matches([]{})); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_FUNCTION_ // Tests that IsNull() describes itself properly. TEST(IsNullTest, CanDescribeSelf) { @@ -1090,14 +1090,14 @@ TEST(NotNullTest, ReferenceToConstLinkedPtr) { EXPECT_TRUE(m.Matches(non_null_p)); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_FUNCTION_ TEST(NotNullTest, StdFunction) { const Matcher<std::function<void()>> m = NotNull(); EXPECT_TRUE(m.Matches([]{})); EXPECT_FALSE(m.Matches(std::function<void()>())); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_FUNCTION_ // Tests that NotNull() describes itself properly. TEST(NotNullTest, CanDescribeSelf) { |