diff options
| author | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-02-11 23:50:38 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-02-11 23:50:38 +0000 |
| commit | e5121b5a828c13588d7aa4fc328b348e92ee4abb (patch) | |
| tree | 16c83bbbabf171bac8edf0ec0cda0e80ec1aaef2 /include | |
| parent | 5b61ce3ee5b15e6356487dd97236bf663a96a391 (diff) | |
| download | googletest-e5121b5a828c13588d7aa4fc328b348e92ee4abb.tar.gz googletest-e5121b5a828c13588d7aa4fc328b348e92ee4abb.tar.bz2 googletest-e5121b5a828c13588d7aa4fc328b348e92ee4abb.zip | |
Improves cross-platform compatibility of gmock output. This fixes issue 135.
Diffstat (limited to 'include')
| -rw-r--r-- | include/gmock/gmock-spec-builders.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index df2aef16..4f0b0725 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -575,7 +575,7 @@ class ExpectationBase { // Describes the source file location of this expectation. void DescribeLocationTo(::std::ostream* os) const { - *os << file() << ":" << line() << ": "; + *os << FormatFileLocation(file(), line()) << " "; } // Describes how many times a function call matching this @@ -1527,7 +1527,7 @@ class FunctionMockerBase : public UntypedFunctionMockerBase { "returning default value.\n"); } else { *os << "taking default action specified at:\n" - << spec->file() << ":" << spec->line() << ":\n"; + << FormatFileLocation(spec->file(), spec->line()) << "\n"; } } |