diff options
| author | bryanzim <BryanZim@bazinnovations.com> | 2017-12-06 11:09:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 11:09:00 -0500 |
| commit | 11d21b7c2ab56aa4ec80bbe31d8b08b6afa91003 (patch) | |
| tree | 314a44d9936dbbe268f383eaa6ab00819371b363 | |
| parent | a7269e24acaa3fe301c1fc34a56a1012a45f77b9 (diff) | |
| parent | a868e618c0607259c63f37d948b72586a13922ff (diff) | |
| download | googletest-11d21b7c2ab56aa4ec80bbe31d8b08b6afa91003.tar.gz googletest-11d21b7c2ab56aa4ec80bbe31d8b08b6afa91003.tar.bz2 googletest-11d21b7c2ab56aa4ec80bbe31d8b08b6afa91003.zip | |
Merge branch 'master' into master
| -rw-r--r-- | googletest/src/gtest-printers.cc | 5 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc index a2df412f..dd67f645 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; } } diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index d77f676d..749e8299 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2884,7 +2884,7 @@ enum GTestColor { }; #if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT + !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW // Returns the character attribute for the given color. WORD GetColorAttribute(GTestColor color) { @@ -2943,7 +2943,7 @@ bool ShouldUseColor(bool stdout_is_tty) { const char* const gtest_color = GTEST_FLAG(color).c_str(); if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) { -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW // On Windows the TERM variable is usually not set, but the // console there does support colors. return stdout_is_tty; @@ -3001,7 +3001,7 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) { } #if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT + !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE); // Gets the current text color. |