Skip to content

G
googletest
Commit bd47c09b by Enji Cooper
Options

Address fallout from -Wsign-conversion work on Windows

Some Windows users builds were broken after a0d60bed. This change addresses the lingering -Wsign-conversion issues with those platforms by adding some missing `static_cast` calls as needed. Signed-off-by: 's avatarEnji Cooper <yaneurabeya@gmail.com>
parent 84d98653
Showing with 4 additions and 3 deletions
googletest/src/gtest-port.cc
...@@ -279,7 +279,7 @@ size_t GetThreadCount() { ...@@ -279,7 +279,7 @@ size_t GetThreadCount() {
#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS #if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
void SleepMilliseconds(int n) { void SleepMilliseconds(int n) {
::Sleep(n); ::Sleep(static_cast<DWORD>(n));
} }
AutoHandle::AutoHandle() AutoHandle::AutoHandle()
......
googletest/src/gtest-printers.cc
...@@ -144,7 +144,8 @@ inline bool IsPrintableAscii(wchar_t c) { ...@@ -144,7 +144,8 @@ inline bool IsPrintableAscii(wchar_t c) {
// which is the type of c. // which is the type of c.
template <typename UnsignedChar, typename Char> template <typename UnsignedChar, typename Char>
static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) { static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
switch (static_cast<wchar_t>(c)) { wchar_t w_c = static_cast<wchar_t>(c);
switch (w_c) {
case L'\0': case L'\0':
*os << "\\0"; *os << "\\0";
break; break;
...@@ -176,7 +177,7 @@ static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) { ...@@ -176,7 +177,7 @@ static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
*os << "\\v"; *os << "\\v";
break; break;
default: default:
if (IsPrintableAscii(c)) { if (IsPrintableAscii(w_c)) {
*os << static_cast<char>(c); *os << static_cast<char>(c);
return kAsIs; return kAsIs;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment