Improves cross-platform compatibility of gmock output. This fixes issue 135.

This commit is contained in:
vladlosev
2011-02-11 23:50:38 +00:00
parent 5b61ce3ee5
commit e5121b5a82
2 changed files with 40 additions and 12 deletions

View File

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