Fixes some style nits; also fixes minor bugs in gtest-death-test.cc.

2 files changed, 3 insertions, 3 deletions

diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h
index 0054bae3..2eefc7bf 100644
--- a/include/gtest/internal/gtest-internal.h
+++ b/include/gtest/internal/gtest-internal.h
@@ -241,11 +241,11 @@ String FormatForFailureMessage(wchar_t wchar);
 // This internal macro is used to avoid duplicated code.
 #define GTEST_FORMAT_IMPL(operand2_type, operand1_printer)\
 inline String FormatForComparisonFailureMessage(\
-    operand2_type::value_type* str, const operand2_type& operand2) {\
+    operand2_type::value_type* str, const operand2_type& /*operand2*/) {\
   return operand1_printer(str);\
 }\
 inline String FormatForComparisonFailureMessage(\
-    const operand2_type::value_type* str, const operand2_type& operand2) {\
+    const operand2_type::value_type* str, const operand2_type& /*operand2*/) {\
   return operand1_printer(str);\
 }
 
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index 90298d5d..0c422cde 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -430,7 +430,7 @@ const ::std::vector<String>& GetArgvs();
 class Mutex {
  public:
   Mutex() {}
-  explicit Mutex(int unused) {}
+  explicit Mutex(int /*unused*/) {}
   void AssertHeld() const {}
   enum { NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX = 0 };
 };