diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-28 23:52:42 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-28 23:52:42 (GMT) |
| commit | fc01f532a622a7d460a4eff816c56c0e501f20f7 (patch) | |
| tree | 523c049421d656a498b3260de830c70b5e2070fe /src | |
| parent | 6a036a5c8c7613e888fad39d92fc3fd84a96fbc7 (diff) | |
| download | googletest-fc01f532a622a7d460a4eff816c56c0e501f20f7.zip googletest-fc01f532a622a7d460a4eff816c56c0e501f20f7.tar.gz googletest-fc01f532a622a7d460a4eff816c56c0e501f20f7.tar.bz2 | |
Fixes unused function warning on Mac, and fixes compatibility with newer GCC.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index 8e6db0c..62b6929 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -3571,13 +3571,13 @@ 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) - GTEST_LOCK_EXCLUDED_(mutex_) { + const std::string& os_stack_trace) { Message msg; msg << message; |