vs2015 hash_map deprecation fixed

google · Sep 1, 2016 · 653db00 · 653db00
1 parent 168e0b9
commit 653db00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
@@ -622,7 +622,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // Determines if hash_map/hash_set are available.
 // Only used for testing against those containers.
 #if !defined(GTEST_HAS_HASH_MAP_)
-# if _MSC_VER
+# if defined (_MSC_VER) && (_MSC_VER < 1900)
 #  define GTEST_HAS_HASH_MAP_ 1  // Indicates that hash_map is available.
 #  define GTEST_HAS_HASH_SET_ 1  // Indicates that hash_set is available.
 # endif  // _MSC_VER

diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc
@@ -222,11 +222,11 @@ 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;
-using ::stdext::hash_multiset;
+#elif _MSC_VER && GTEST_HAS_HASH_MAP_
+	using ::stdext::hash_map;
+	using ::stdext::hash_set;
+	using ::stdext::hash_multimap;
+	using ::stdext::hash_multiset;
 #endif
 
 // Prints a value to a string using the universal value printer.  This