From 653db004ada1da2d8e4664a89b7b5f173c7c08ff Mon Sep 17 00:00:00 2001 From: Eugene Smirnov Date: Thu, 1 Sep 2016 22:32:54 +0300 Subject: [PATCH] vs2015 hash_map deprecation fixed --- googletest/include/gtest/internal/gtest-port.h | 2 +- googletest/test/gtest-printers_test.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 92f4c11c4f..2ed0bcaf66 100644 --- 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 index 3e97cc24ab..51afb4f548 100644 --- 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