diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-04-24 02:48:07 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-04-24 02:48:07 +0000 |
| commit | c84afbeaf1003ae2d4a0f6d36bbb8938bc73bbc7 (patch) | |
| tree | 579dbb36e9828a7b80dfa07660a754d4f6c27d54 /src | |
| parent | 0fac83390adaf4e80ddee5bc3747079be4234c27 (diff) | |
| download | googletest-c84afbeaf1003ae2d4a0f6d36bbb8938bc73bbc7.tar.gz googletest-c84afbeaf1003ae2d4a0f6d36bbb8938bc73bbc7.tar.bz2 googletest-c84afbeaf1003ae2d4a0f6d36bbb8938bc73bbc7.zip | |
Fixes a thread annotation; updates CHANGES for 1.7.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index b9b44a16..6b9d75df 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; |