gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging, merging

Browse Source
This commit is contained in:
Gennadiy Civil 2018-03-13 16:02:05 -04:00
parent a719320a3c
commit 2814b4b089
2 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/include/gtest/internal/gtest-port.h
View File

@ -371,6 +371,8 @@
# define GTEST_HAS_STD_MOVE_ 1 # define GTEST_HAS_STD_MOVE_ 1
# define GTEST_HAS_STD_UNIQUE_PTR_ 1 # define GTEST_HAS_STD_UNIQUE_PTR_ 1
# define GTEST_HAS_STD_SHARED_PTR_ 1 # define GTEST_HAS_STD_SHARED_PTR_ 1
# define GTEST_HAS_UNORDERED_MAP_ 1
# define GTEST_HAS_UNORDERED_SET_ 1
#endif #endif
// C++11 specifies that <tuple> provides std::tuple. // C++11 specifies that <tuple> provides std::tuple.

60
googletest/test/gtest-printers_test.cc
View File

@ -50,14 +50,13 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
// hash_set are available under Visual C++, or on Linux. #if GTEST_HAS_UNORDERED_MAP_
#if GTEST_HAS_HASH_MAP_ # include <unordered_map> // NOLINT
# include <hash_map> // NOLINT #endif // GTEST_HAS_UNORDERED_MAP_
#endif // GTEST_HAS_HASH_MAP_
#if GTEST_HAS_HASH_SET_ #if GTEST_HAS_UNORDERED_SET_
# include <hash_set> // NOLINT # include <unordered_set> // NOLINT
#endif // GTEST_HAS_HASH_SET_ #endif // GTEST_HAS_UNORDERED_SET_
#if GTEST_HAS_STD_FORWARD_LIST_ #if GTEST_HAS_STD_FORWARD_LIST_
# include <forward_list> // NOLINT # include <forward_list> // NOLINT
@ -236,34 +235,6 @@ using ::testing::internal::UniversalTersePrint;
using ::testing::internal::UniversalTersePrintTupleFieldsToStrings; using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
#endif #endif
// The hash_* classes are not part of the C++ standard. STLport
// defines them in namespace std. MSVC defines them in ::stdext. GCC
// defines them in ::.
#if GTEST_HAS_HASH_MAP_
#ifdef _STLP_HASH_MAP // We got <hash_map> from STLport.
using ::std::hash_map;
using ::std::hash_multimap;
#elif _MSC_VER
using ::stdext::hash_map;
using ::stdext::hash_multimap;
#endif
#endif
#if GTEST_HAS_HASH_SET_
#ifdef _STLP_HASH_MAP // We got <hash_map> from STLport.
using ::std::hash_map;
using ::std::hash_multimap;
#elif _MSC_VER
using ::stdext::hash_map;
using ::stdext::hash_multimap;
#endif
#endif
// Prints a value to a string using the universal value printer. This // Prints a value to a string using the universal value printer. This
// is a helper for testing UniversalPrinter<T>::Print() for various types. // is a helper for testing UniversalPrinter<T>::Print() for various types.
template <typename T> template <typename T>
@ -848,7 +819,13 @@ TEST(PrintStlContainerTest, NonEmptyDeque) {
EXPECT_EQ("{ 1, 3 }", Print(non_empty)); EXPECT_EQ("{ 1, 3 }", Print(non_empty));
} }
#if GTEST_HAS_HASH_MAP_ #if GTEST_HAS_UNORDERED_MAP_
template <class Key, class T>
using hash_map = ::std::unordered_map<Key, T>;
template <class Key, class T>
using hash_multimap = ::std::unordered_multimap<Key, T>;
TEST(PrintStlContainerTest, OneElementHashMap) { TEST(PrintStlContainerTest, OneElementHashMap) {
hash_map<int, char> map1; hash_map<int, char> map1;
@ -868,9 +845,14 @@ TEST(PrintStlContainerTest, HashMultiMap) {
<< " where Print(map1) returns \"" << result << "\"."; << " where Print(map1) returns \"" << result << "\".";
} }
#endif // GTEST_HAS_HASH_MAP_ #endif // GTEST_HAS_UNORDERED_MAP_
#if GTEST_HAS_HASH_SET_ #if GTEST_HAS_UNORDERED_SET_
template <class Key>
using hash_set = ::std::unordered_set<Key>;
template <class Key>
using hash_multiset = ::std::unordered_multiset<Key>;
TEST(PrintStlContainerTest, HashSet) { TEST(PrintStlContainerTest, HashSet) {
hash_set<int> set1; hash_set<int> set1;
@ -907,7 +889,7 @@ TEST(PrintStlContainerTest, HashMultiSet) {
EXPECT_TRUE(std::equal(a, a + kSize, numbers.begin())); EXPECT_TRUE(std::equal(a, a + kSize, numbers.begin()));
} }
#endif // GTEST_HAS_HASH_SET_ #endif // GTEST_HAS_UNORDERED_SET_
TEST(PrintStlContainerTest, List) { TEST(PrintStlContainerTest, List) {
const std::string a[] = {"hello", "world"}; const std::string a[] = {"hello", "world"};