diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2017-05-02 18:53:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 18:53:21 (GMT) |
| commit | 0ad83afdaa3319dadd9f03299bd62f93e6afe2d3 (patch) | |
| tree | b1ce97f8600b713f796b4984c867cb75d585eabc | |
| parent | 69c6db249af5e74cf5b6d6b455813f79faf52835 (diff) | |
| parent | 518e0519ca49c3a6504d1e377c5a467434d5f719 (diff) | |
| download | googletest-0ad83afdaa3319dadd9f03299bd62f93e6afe2d3.zip googletest-0ad83afdaa3319dadd9f03299bd62f93e6afe2d3.tar.gz googletest-0ad83afdaa3319dadd9f03299bd62f93e6afe2d3.tar.bz2 | |
Merge pull request #1034 from dankegel/master
Minimal changes to fix build failures on Microsoft Visual Studio 2015
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 | ||||
| -rw-r--r-- | googletest/test/gtest-printers_test.cc | 2 | ||||
| -rw-r--r-- | googletest/test/gtest_catch_exceptions_test_.cc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index cb9ab95..38a8365 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 af69f28..107b10f 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/gtest-printers_test.cc @@ -216,6 +216,7 @@ using ::testing::internal::UniversalTersePrintTupleFieldsToStrings; #endif using ::testing::internal::string; +#if GTEST_HAS_HASH_MAP_ // 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 ::. @@ -230,6 +231,7 @@ using ::stdext::hash_set; using ::stdext::hash_multimap; using ::stdext::hash_multiset; #endif +#endif // Prints a value to a string using the universal value printer. This // is a helper for testing UniversalPrinter<T>::Print() for various types. diff --git a/googletest/test/gtest_catch_exceptions_test_.cc b/googletest/test/gtest_catch_exceptions_test_.cc index d0fc82c..b42637e 100644 --- a/googletest/test/gtest_catch_exceptions_test_.cc +++ b/googletest/test/gtest_catch_exceptions_test_.cc @@ -138,7 +138,7 @@ TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) { } // Exceptions in destructors are not supported in C++11. -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L +#if !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L && _MSC_VER < 1900 class CxxExceptionInDestructorTest : public Test { public: static void TearDownTestCase() { |