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

3 files changed, 5 insertions, 5 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 };
 };
diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc
index 09fdd3ff..919fb53a 100644
--- a/src/gtest-death-test.cc
+++ b/src/gtest-death-test.cc
@@ -47,7 +47,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION
-#include "gtest-internal-inl.h"
+#include "src/gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION
 
 namespace testing {
@@ -688,7 +688,7 @@ static void SplitString(const ::std::string& str, char delimiter,
   ::std::vector< ::std::string> parsed;
   ::std::string::size_type pos = 0;
   while (true) {
-    const ::std::string::size_type colon = str.find(':', pos);
+    const ::std::string::size_type colon = str.find(delimiter, pos);
     if (colon == ::std::string::npos) {
       parsed.push_back(str.substr(pos));
       break;