diff options
author | Abseil Team <absl-team@google.com> | 2018-12-17 23:59:00 (GMT) |
---|---|---|
committer | Mark Barolak <mbar@google.com> | 2018-12-20 19:09:31 (GMT) |
commit | e26a3fa13ca21500773293946e92ec72f8d8c9ea (patch) | |
tree | c69e48ca1dcbe3623903040d25b4647d70f7d3bf /googlemock/test/gmock-generated-matchers_test.cc | |
parent | 9ab640ce5e5120021c5972d7e60f258bfca64d71 (diff) | |
download | googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.zip googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.tar.gz googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.tar.bz2 |
Googletest export
Unifdef c++11-related macros from googletest now that it requires C++11.
PiperOrigin-RevId: 225905601
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 727c8ea..426e954 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 |