diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-01-03 21:13:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 21:13:20 -0600 |
| commit | 0ffa5f9779fc3a1b18d4931484b46825d952821d (patch) | |
| tree | f31698c81378165e2fe639e93d6f54b252b1e2c2 /googlemock/test/gmock-generated-matchers_test.cc | |
| parent | 0c0ca90382457859785a97bea5695093d72097dd (diff) | |
| parent | 3880b13e4c0b04ca88f69b9c93da6058bd836c34 (diff) | |
| download | googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.gz googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.bz2 googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.zip | |
Merge branch 'master' into chore/fix_library_json
Diffstat (limited to 'googlemock/test/gmock-generated-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-matchers_test.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc index 727c8eaa..426e9545 100644 --- a/googlemock/test/gmock-generated-matchers_test.cc +++ b/googlemock/test/gmock-generated-matchers_test.cc @@ -489,7 +489,6 @@ TEST(ElementsAreArrayTest, CanBeCreatedWithVector) { EXPECT_THAT(test_vector, Not(ElementsAreArray(expected))); } -#if GTEST_HAS_STD_INITIALIZER_LIST_ TEST(ElementsAreArrayTest, TakesInitializerList) { const int a[5] = { 1, 2, 3, 4, 5 }; @@ -525,7 +524,6 @@ TEST(ElementsAreArrayTest, { Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) }))); } -#endif // GTEST_HAS_STD_INITIALIZER_LIST_ TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) { const int a[] = { 1, 2, 3 }; @@ -1139,7 +1137,6 @@ TEST(AnyOfTest, DoesNotCallAnyOfUnqualified) { } // namespace adl_test -#if GTEST_LANG_CXX11 TEST(AllOfTest, WorksOnMoveOnlyType) { std::unique_ptr<int> p(new int(3)); @@ -1177,7 +1174,6 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) { EXPECT_THAT(p, Not(UniquePointee(2))); } -#endif // GTEST_LASNG_CXX11 } // namespace |