eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
shiqian 2008-07-23 20:28:27 +00:00
parent 57b43f2775
commit b758726396
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gtest/internal/gtest-internal.h
View File

@ -241,11 +241,11 @@ String FormatForFailureMessage(wchar_t wchar);
// This internal macro is used to avoid duplicated code. // This internal macro is used to avoid duplicated code.
#define GTEST_FORMAT_IMPL(operand2_type, operand1_printer)\ #define GTEST_FORMAT_IMPL(operand2_type, operand1_printer)\
inline String FormatForComparisonFailureMessage(\ 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);\ return operand1_printer(str);\
}\ }\
inline String FormatForComparisonFailureMessage(\ 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);\ return operand1_printer(str);\
} }

2
include/gtest/internal/gtest-port.h
View File

@ -430,7 +430,7 @@ const ::std::vector<String>& GetArgvs();
class Mutex { class Mutex {
public: public:
Mutex() {} Mutex() {}
explicit Mutex(int unused) {} explicit Mutex(int /*unused*/) {}
void AssertHeld() const {} void AssertHeld() const {}
enum { NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX = 0 }; enum { NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX = 0 };
}; };

4
src/gtest-death-test.cc
View File

@ -47,7 +47,7 @@
// prevent a user from accidentally including gtest-internal-inl.h in // prevent a user from accidentally including gtest-internal-inl.h in
// his code. // his code.
#define GTEST_IMPLEMENTATION #define GTEST_IMPLEMENTATION
#include "gtest-internal-inl.h" #include "src/gtest-internal-inl.h"
#undef GTEST_IMPLEMENTATION #undef GTEST_IMPLEMENTATION
namespace testing { namespace testing {
@ -688,7 +688,7 @@ static void SplitString(const ::std::string& str, char delimiter,
::std::vector< ::std::string> parsed; ::std::vector< ::std::string> parsed;
::std::string::size_type pos = 0; ::std::string::size_type pos = 0;
while (true) { 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) { if (colon == ::std::string::npos) {
parsed.push_back(str.substr(pos)); parsed.push_back(str.substr(pos));
break; break;