diff options
author | Arkadiy Shapkin <arkady.shapkin@gmail.com> | 2017-05-03 10:40:33 (GMT) |
---|---|---|
committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-10-25 13:04:01 (GMT) |
commit | 2641b021fc2ab12896cf868d90f19936ef4b4696 (patch) | |
tree | 94f1a3f223b38d4830d639f8b892378ff8c69443 /googletest/test/gtest_catch_exceptions_test_.cc | |
parent | 77380cddf77133b98a16b5427ac732648233de29 (diff) | |
download | googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.zip googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.tar.gz googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.tar.bz2 |
Fix tests with VS2015 and VS2017
Diffstat (limited to 'googletest/test/gtest_catch_exceptions_test_.cc')
-rw-r--r-- | googletest/test/gtest_catch_exceptions_test_.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest_catch_exceptions_test_.cc b/googletest/test/gtest_catch_exceptions_test_.cc index b42637e..c6d953c 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 && _MSC_VER < 1900 +#if !GTEST_LANG_CXX11 class CxxExceptionInDestructorTest : public Test { public: static void TearDownTestCase() { |