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 /src/gtest.cc | |
| parent | 69c199d08a8731a9d5e66004d1b434a21016c3c8 (diff) | |
| download | gtest-aa3c420019cb0215b00013cb94658a917ec4f712.tar.gz gtest-aa3c420019cb0215b00013cb94658a917ec4f712.tar.bz2 gtest-aa3c420019cb0215b00013cb94658a917ec4f712.tar.xz | |
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 'src/gtest.cc')
| -rw-r--r-- | src/gtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index 56af646..78f113e 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -3530,7 +3530,7 @@ void StreamingListener::MakeConnection() { // Pushes the given source file location and message onto a per-thread // trace stack maintained by Google Test. ScopedTrace::ScopedTrace(const char* file, int line, const Message& message) - GTEST_LOCK_EXCLUDED_(UnitTest::mutex_) { + GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { TraceInfo trace; trace.file = file; trace.line = line; @@ -3541,7 +3541,7 @@ ScopedTrace::ScopedTrace(const char* file, int line, const Message& message) // Pops the info pushed by the c'tor. ScopedTrace::~ScopedTrace() - GTEST_LOCK_EXCLUDED_(UnitTest::mutex_) { + GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { UnitTest::GetInstance()->PopGTestTrace(); } |