diff options
| author | kosak <kosak@google.com> | 2014-11-17 00:28:55 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-11-17 00:28:55 +0000 |
| commit | 5b9cbbb16d774bfcb51572d52eda3f7319088e23 (patch) | |
| tree | 37a3062d21b4c056774ea2afe983c7050f1492be /test/gmock-matchers_test.cc | |
| parent | 2336e9c171b5894bac98f828289f537e29691896 (diff) | |
| download | googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.tar.gz googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.tar.bz2 googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.zip | |
Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.
Bring in gtest 694.
Diffstat (limited to 'test/gmock-matchers_test.cc')
| -rw-r--r-- | test/gmock-matchers_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index b44426e5..c5476223 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -54,7 +54,7 @@ #include "gtest/gtest.h" #include "gtest/gtest-spi.h" -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_FORWARD_LIST_ # include <forward_list> // NOLINT #endif @@ -4545,7 +4545,7 @@ TEST(StreamlikeTest, Iteration) { } } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_FORWARD_LIST_ TEST(BeginEndDistanceIsTest, WorksWithForwardList) { std::forward_list<int> container; EXPECT_THAT(container, BeginEndDistanceIs(0)); @@ -4557,7 +4557,7 @@ TEST(BeginEndDistanceIsTest, WorksWithForwardList) { EXPECT_THAT(container, Not(BeginEndDistanceIs(0))); EXPECT_THAT(container, BeginEndDistanceIs(2)); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_FORWARD_LIST_ TEST(BeginEndDistanceIsTest, WorksWithNonStdList) { const int a[5] = {1, 2, 3, 4, 5}; |