diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-23 20:28:27 (GMT) |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-23 20:28:27 (GMT) |
| commit | b75872639683cf572253f20863982324b113205e (patch) | |
| tree | c98ea61d743b0d2f2ebba5bb9edd5ae0ca98bb28 /src | |
| parent | 57b43f27754a78b7d405270edd31346f42b0b2ad (diff) | |
| download | googletest-b75872639683cf572253f20863982324b113205e.zip googletest-b75872639683cf572253f20863982324b113205e.tar.gz googletest-b75872639683cf572253f20863982324b113205e.tar.bz2 | |
Fixes some style nits; also fixes minor bugs in gtest-death-test.cc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest-death-test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc index 09fdd3f..919fb53 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; |