Merge pull request #1225 from brian-peloton/master

Speed up printing of characters which need hex escaping
2017-12-05 17:19:23 -05:00
parent 247a3d8e5e 9e236748fb
commit a868e618c0
1 changed files with 4 additions and 1 deletions
--- 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;
      }
  }