summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-17 23:08:48 +0000
committerkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-17 23:08:48 +0000
commit9d76b88b263d73474d4625c56429e97060e64f29 (patch)
treea6217cdc639b43937500f22ada5f21e091c48d76 /test
parent9ee09fed2fcd57093fc83dc8e53301270e7227c9 (diff)
downloadgoogletest-9d76b88b263d73474d4625c56429e97060e64f29.tar.gz
Determine the existence of hash_map/hash_set in gtest-port.h.
git-svn-id: http://googletest.googlecode.com/svn/trunk@727 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
-rw-r--r--test/gtest-printers_test.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/gtest-printers_test.cc b/test/gtest-printers_test.cc
index a6636c5..3e97cc2 100644
--- a/test/gtest-printers_test.cc
+++ b/test/gtest-printers_test.cc
@@ -50,13 +50,13 @@
#include "gtest/gtest.h"
-// hash_map and hash_set are available under Visual C++.
-#if _MSC_VER
-# define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available.
+// hash_map and hash_set are available under Visual C++, or on Linux.
+#if GTEST_HAS_HASH_MAP_
# include <hash_map> // NOLINT
-# define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available.
+#endif // GTEST_HAS_HASH_MAP_
+#if GTEST_HAS_HASH_SET_
# include <hash_set> // NOLINT
-#endif // GTEST_OS_WINDOWS
+#endif // GTEST_HAS_HASH_SET_
#if GTEST_HAS_STD_FORWARD_LIST_
# include <forward_list> // NOLINT