diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-23 12:33:54 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-23 12:33:54 -0500 |
| commit | 80defcec57cecc637e9fdfe0160e122f890eed54 (patch) | |
| tree | 831c59280c0bcfa28afdf57fab14396e30cf8018 /googletest/test/gtest-printers_test.cc | |
| parent | 58df5760569ffe17bcc492465f8cd57008840039 (diff) | |
| download | googletest-80defcec57cecc637e9fdfe0160e122f890eed54.tar.gz googletest-80defcec57cecc637e9fdfe0160e122f890eed54.tar.bz2 googletest-80defcec57cecc637e9fdfe0160e122f890eed54.zip | |
Many code merge/upstream changes
Diffstat (limited to 'googletest/test/gtest-printers_test.cc')
| -rw-r--r-- | googletest/test/gtest-printers_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc index 70ac9c55..aff97a2a 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/gtest-printers_test.cc @@ -275,11 +275,11 @@ using hash_multiset = ::std::unordered_multiset<Key>; #elif GTEST_HAS_HASH_SET_ #ifdef _STLP_HASH_MAP // We got <hash_map> from STLport. -using ::std::hash_set; -using ::std::hash_multiset; +using ::std::hash_map; +using ::std::hash_multimap; #elif _MSC_VER -using ::stdext::hash_set; -using ::stdext::hash_multiset; +using ::stdext::hash_map; +using ::stdext::hash_multimap; #endif #endif |