Fixes a thread annotation; updates CHANGES for 1.7.0
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user