Expressed the thread-safety annotations in code, replacing the existing comment-based system (by Aaron Jacobs).

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h
index 8a85724b..d869f0f6 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.