diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-04-04 22:44:57 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-04-04 22:44:57 +0000 |
| commit | 5f18b68bfc96e69f8b1e5b7b5449f4890c1a2016 (patch) | |
| tree | 3ae3effb1cd991d106b0986fa36e21075c11de36 /test/gtest-printers_test.cc | |
| parent | c08ec2a768c2fa7183b2cca0c9c6f36d53ca46fb (diff) | |
| download | googletest-5f18b68bfc96e69f8b1e5b7b5449f4890c1a2016.tar.gz googletest-5f18b68bfc96e69f8b1e5b7b5449f4890c1a2016.tar.bz2 googletest-5f18b68bfc96e69f8b1e5b7b5449f4890c1a2016.zip | |
Fixes some compatibility issues with STLport.
Diffstat (limited to 'test/gtest-printers_test.cc')
| -rw-r--r-- | test/gtest-printers_test.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/gtest-printers_test.cc b/test/gtest-printers_test.cc index 45610f8f..c2beca7d 100644 --- a/test/gtest-printers_test.cc +++ b/test/gtest-printers_test.cc @@ -214,10 +214,15 @@ using ::std::tr1::make_tuple; using ::std::tr1::tuple; #endif -#if _MSC_VER -// MSVC defines the following classes in the ::stdext namespace while -// gcc defines them in the :: namespace. Note that they are not part -// of the C++ standard. +// 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 ::. +#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_set; using ::stdext::hash_multimap; |