diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-09 14:41:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 14:41:02 (GMT) |
| commit | 55fca1937d82bd67a910db142a5aa41311f09f1b (patch) | |
| tree | 9fe63c533461d3bf9f25e855b50586bd9fc6ed6c /googletest/src | |
| parent | c5cba7d17a928c18c61feb71db0d6a21ea1dc9db (diff) | |
| parent | 59202300f1a774068608caff0351cc084fe79e7c (diff) | |
| download | googletest-55fca1937d82bd67a910db142a5aa41311f09f1b.zip googletest-55fca1937d82bd67a910db142a5aa41311f09f1b.tar.gz googletest-55fca1937d82bd67a910db142a5aa41311f09f1b.tar.bz2 | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest-printers.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc index a2df412..dd67f64 100644 --- a/googletest/src/gtest-printers.cc +++ b/googletest/src/gtest-printers.cc @@ -180,7 +180,10 @@ static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) { *os << static_cast<char>(c); return kAsIs; } else { - *os << "\\x" + String::FormatHexInt(static_cast<UnsignedChar>(c)); + ostream::fmtflags flags = os->flags(); + *os << "\\x" << std::hex << std::uppercase + << static_cast<int>(static_cast<UnsignedChar>(c)); + os->flags(flags); return kHexEscape; } } |