Fixes a thread annotation; updates CHANGES for 1.7.0

This commit is contained in:
zhanyong.wan
2013-04-24 02:48:07 +00:00
parent 0fac83390a
commit c84afbeaf1
2 changed files with 19 additions and 3 deletions

View File

@@ -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;