diff options
| author | kosak <kosak@google.com> | 2013-12-04 23:49:07 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2013-12-04 23:49:07 +0000 |
| commit | 18489fa4f81a65ab5f42a6705c28ca2f80eab3bd (patch) | |
| tree | 83ff20f48fbb9a198f4b23e669a41935bcc2e969 /test | |
| parent | 6414d806cd7d0954cce81348552fdd1e5bd31515 (diff) | |
| download | googletest-18489fa4f81a65ab5f42a6705c28ca2f80eab3bd.tar.gz googletest-18489fa4f81a65ab5f42a6705c28ca2f80eab3bd.tar.bz2 googletest-18489fa4f81a65ab5f42a6705c28ca2f80eab3bd.zip | |
Distinguish between C++11 language and library support for <initializer_list>.
Fix spelling: repositary -> repository.
Pull in gtest 671.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gmock-generated-matchers_test.cc | 4 | ||||
| -rw-r--r-- | test/gmock-matchers_test.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/gmock-generated-matchers_test.cc b/test/gmock-generated-matchers_test.cc index c59b7dec..ff235001 100644 --- a/test/gmock-generated-matchers_test.cc +++ b/test/gmock-generated-matchers_test.cc @@ -630,7 +630,7 @@ TEST(ElementsAreArrayTest, CanBeCreatedWithVector) { EXPECT_THAT(test_vector, Not(ElementsAreArray(expected))); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_INITIALIZER_LIST_ TEST(ElementsAreArrayTest, TakesInitializerList) { const int a[5] = { 1, 2, 3, 4, 5 }; @@ -666,7 +666,7 @@ TEST(ElementsAreArrayTest, { Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) }))); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_INITIALIZER_LIST_ TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) { const int a[] = { 1, 2, 3 }; diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index bd7a38a5..2a5cf908 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -4503,7 +4503,7 @@ TEST(UnorderedElementsAreArrayTest, WorksForStreamlike) { EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected))); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_INITIALIZER_LIST_ TEST(UnorderedElementsAreArrayTest, TakesInitializerList) { const int a[5] = { 2, 1, 4, 5, 3 }; @@ -4537,7 +4537,7 @@ TEST(UnorderedElementsAreArrayTest, { Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) }))); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_INITIALIZER_LIST_ class UnorderedElementsAreTest : public testing::Test { protected: |