diff options
| author | Jonny007-MKD <Jonny007-MKD@users.noreply.github.com> | 2018-09-14 20:39:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 20:39:45 (GMT) |
| commit | 631e3a58389a21bec310470b7788b30dfa17a217 (patch) | |
| tree | 4aee2a3d4206bf44197f60b051fd8700030dbbe3 /googletest | |
| parent | 1b2da360eddeb98f4ee45efabb0056cc28590760 (diff) | |
| parent | bc2d0935b74917be0821bfd834472ed9cc4a3b5b (diff) | |
| download | googletest-631e3a58389a21bec310470b7788b30dfa17a217.zip googletest-631e3a58389a21bec310470b7788b30dfa17a217.tar.gz googletest-631e3a58389a21bec310470b7788b30dfa17a217.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index de19449..bd1117b 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -63,9 +63,7 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { #include <map> #include <vector> #include <ostream> -#if GTEST_LANG_CXX11 #include <unordered_set> -#endif // GTEST_LANG_CXX11 #include "gtest/gtest-spi.h" #include "src/gtest-internal-inl.h" @@ -5165,8 +5163,7 @@ TEST(AssertionResultTest, CanStreamOstreamManipulators) { EXPECT_STREQ("Data\n\\0Will be visible", r.message()); } -// The next test uses explicit conversion operators -- a C++11 feature. -#if GTEST_LANG_CXX11 +// The next test uses explicit conversion operators TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) { struct ExplicitlyConvertibleToBool { @@ -5179,8 +5176,6 @@ TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) { EXPECT_TRUE(v2); } -#endif // GTEST_LANG_CXX11 - struct ConvertibleToAssertionResult { operator AssertionResult() const { return AssertionResult(true); } }; @@ -7564,7 +7559,6 @@ TEST(IsContainerTestTest, WorksForContainer) { sizeof(IsContainerTest<std::map<int, double> >(0))); } -#if GTEST_LANG_CXX11 struct ConstOnlyContainerWithPointerIterator { using const_iterator = int*; const_iterator begin() const; @@ -7586,7 +7580,6 @@ TEST(IsContainerTestTest, ConstOnlyContainer) { EXPECT_EQ(sizeof(IsContainer), sizeof(IsContainerTest<ConstOnlyContainerWithClassIterator>(0))); } -#endif // GTEST_LANG_CXX11 // Tests IsHashTable. struct AHashTable { @@ -7599,10 +7592,8 @@ struct NotReallyAHashTable { TEST(IsHashTable, Basic) { EXPECT_TRUE(testing::internal::IsHashTable<AHashTable>::value); EXPECT_FALSE(testing::internal::IsHashTable<NotReallyAHashTable>::value); -#if GTEST_LANG_CXX11 EXPECT_FALSE(testing::internal::IsHashTable<std::vector<int>>::value); EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value); -#endif // GTEST_LANG_CXX11 #if GTEST_HAS_HASH_SET_ EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set<int>>::value); #endif // GTEST_HAS_HASH_SET_ |