diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2012-05-31 20:37:13 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2012-05-31 20:37:13 +0000 |
| commit | aa3c420019cb0215b00013cb94658a917ec4f712 (patch) | |
| tree | ed3a1185c93839b0026103187b5fad7dd349f359 /test/gtest_catch_exceptions_test_.cc | |
| parent | 69c199d08a8731a9d5e66004d1b434a21016c3c8 (diff) | |
| download | googletest-aa3c420019cb0215b00013cb94658a917ec4f712.tar.gz | |
Fixes threading annotations and compatibility with C++11, which doesn't
allow exepctions to be thrown in a destructor.
git-svn-id: http://googletest.googlecode.com/svn/trunk@615 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test/gtest_catch_exceptions_test_.cc')
| -rw-r--r-- | test/gtest_catch_exceptions_test_.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/gtest_catch_exceptions_test_.cc b/test/gtest_catch_exceptions_test_.cc index a35103f..d0fc82c 100644 --- a/test/gtest_catch_exceptions_test_.cc +++ b/test/gtest_catch_exceptions_test_.cc @@ -137,6 +137,8 @@ TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) { << "called unexpectedly."; } +// Exceptions in destructors are not supported in C++11. +#if !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L class CxxExceptionInDestructorTest : public Test { public: static void TearDownTestCase() { @@ -153,6 +155,7 @@ class CxxExceptionInDestructorTest : public Test { }; TEST_F(CxxExceptionInDestructorTest, ThrowsExceptionInDestructor) {} +#endif // C++11 mode class CxxExceptionInSetUpTestCaseTest : public Test { public: |