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

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

View File

@@ -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;