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: Enji Cooper <yaneurabeya@gmail.com>

Address fallout from -Wsign-conversion work on Windows
bd47c09b · Enji Cooper · 84d98653 · bd47c09b · bd47c09b
Commit bd47c09b authored Apr 26, 2019 by Enji Cooper
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

gtest-port.cc googletest/src/gtest-port.cc +1 -1

gtest-printers.cc googletest/src/gtest-printers.cc +3 -2

No files found.
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
@@ -279,7 +279,7 @@ size_t GetThreadCount() {
 #if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS

 void SleepMilliseconds(int n) {
-  ::Sleep(n);
+  ::Sleep(static_cast<DWORD>(n));
 }

 AutoHandle::AutoHandle()

--- a/googletest/src/gtest-printers.cc
+++ b/googletest/src/gtest-printers.cc
@@ -144,7 +144,8 @@ inline bool IsPrintableAscii(wchar_t c) {
 // which is the type of c.
 template <typename UnsignedChar, typename Char>
 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':
      *os << "\\0";
      break;
@@ -176,7 +177,7 @@ static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
      *os << "\\v";
      break;
    default:
-      if (IsPrintableAscii(c)) {
+      if (IsPrintableAscii(w_c)) {
        *os << static_cast<char>(c);
        return kAsIs;
      } else {