From fc01f532a622a7d460a4eff816c56c0e501f20f7 Mon Sep 17 00:00:00 2001
From: "zhanyong.wan" <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Thu, 28 Feb 2013 23:52:42 +0000
Subject: Fixes unused function warning on Mac, and fixes compatibility with
 newer GCC.

---
 src/gtest.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/gtest.cc b/src/gtest.cc
index 8e6db0c7..62b69291 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;
 
-- 
cgit v1.2.3