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

Fixes some compatibility issues with STLport.

Browse Source
This commit is contained in:
zhanyong.wan 2013-04-04 22:44:57 +00:00
parent c08ec2a768
commit 5f18b68bfc
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/gtest-printers_test.cc
View File

@ -214,10 +214,15 @@ using ::std::tr1::make_tuple;
using ::std::tr1::tuple; using ::std::tr1::tuple;
#endif #endif
#if _MSC_VER // The hash_* classes are not part of the C++ standard. STLport
// MSVC defines the following classes in the ::stdext namespace while // defines them in namespace std. MSVC defines them in ::stdext. GCC
// gcc defines them in the :: namespace. Note that they are not part // defines them in ::.
// of the C++ standard. #ifdef _STLP_HASH_MAP // We got <hash_map> from STLport.
using ::std::hash_map;
using ::std::hash_set;
using ::std::hash_multimap;
using ::std::hash_multiset;
#elif _MSC_VER
using ::stdext::hash_map; using ::stdext::hash_map;
using ::stdext::hash_set; using ::stdext::hash_set;
using ::stdext::hash_multimap; using ::stdext::hash_multimap;

2
test/gtest_unittest.cc
View File

@ -4518,7 +4518,7 @@ TEST(EqAssertionTest, StdString) {
// Compares a const char* to an std::string that has different // Compares a const char* to an std::string that has different
// content // content
EXPECT_NONFATAL_FAILURE(EXPECT_EQ("Test", ::std::string("test")), EXPECT_NONFATAL_FAILURE(EXPECT_EQ("Test", ::std::string("test")),
"::std::string(\"test\")"); "\"test\"");
// Compares an std::string to a char* that has different content. // Compares an std::string to a char* that has different content.
char* const p1 = const_cast<char*>("foo"); char* const p1 = const_cast<char*>("foo");