Fixes a thread annotation; updates CHANGES for 1.7.0

git-svn-id: http://googletest.googlecode.com/svn/trunk@653 861a406c-534a-0410-8894-cb66d6ee9925

1 files changed, 1 insertions, 2 deletions

diff --git a/src/gtest.cc b/src/gtest.cc
index b9b44a1..6b9d75d 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -3705,13 +3705,12 @@ Environment* UnitTest::AddEnvironment(Environment* env) {
 // assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
 // this to report their results.  The user code should use the
 // assertion macros instead of calling this directly.
-GTEST_LOCK_EXCLUDED_(mutex_)
 void UnitTest::AddTestPartResult(
     TestPartResult::Type result_type,
     const char* file_name,
     int line_number,
     const std::string& message,
-    const std::string& os_stack_trace) {
+    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
   Message msg;
   msg << message;