diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-24 21:13:56 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-24 21:13:56 +0000 |
| commit | ee89af8d5f0578d9da31c5295f59f2d2bdebec39 (patch) | |
| tree | 56ae16e703b8a380113bf2018520e22d2edd512b /src/gtest-internal-inl.h | |
| parent | b4661bcb1515f2b004928e3d17dff2248a333ad1 (diff) | |
| download | gtest-ee89af8d5f0578d9da31c5295f59f2d2bdebec39.tar.gz gtest-ee89af8d5f0578d9da31c5295f59f2d2bdebec39.tar.bz2 gtest-ee89af8d5f0578d9da31c5295f59f2d2bdebec39.tar.xz | |
Expressed the thread-safety annotations in code, replacing the existing comment-based system (by Aaron Jacobs).
git-svn-id: http://googletest.googlecode.com/svn/trunk@604 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src/gtest-internal-inl.h')
| -rw-r--r-- | src/gtest-internal-inl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index 8a85724..d869f0f 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -438,8 +438,12 @@ class OsStackTraceGetterInterface { class OsStackTraceGetter : public OsStackTraceGetterInterface { public: OsStackTraceGetter() : caller_frame_(NULL) {} - virtual String CurrentStackTrace(int max_depth, int skip_count); + + virtual String CurrentStackTrace(int max_depth, int skip_count) + GTEST_LOCK_EXCLUDED_(mutex_); + virtual void UponLeavingGTest(); + GTEST_LOCK_EXCLUDED_(mutex_); // This string is inserted in place of stack frames that are part of // Google Test's implementation. |