Merge pull request #2260 from 741g:master

PiperOrigin-RevId: 249660276
2019-05-23 16:20:24 -04:00 · 2019-05-23 16:20:24 -04:00 · 7f1c0f6f81
commit 7f1c0f6f81
parent 88f0493098 2f58f41d1a
1 changed files with 1 additions and 1 deletions
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@ -1691,7 +1691,7 @@ AssertionResult HRESULTFailureHelper(const char* expr,
  char error_text[kBufSize] = { '\0' };
  DWORD message_length = ::FormatMessageA(kFlags,
                                          0,   // no source, we're asking system
-                                          hr,  // the error
+                                          static_cast<DWORD>(hr),  // the error
                                          0,   // no line width restrictions
                                          error_text,  // output buffer
                                          kBufSize,    // buf size