Merge pull request #2260 from 741g:master

PiperOrigin-RevId: 249660276
google · May 23, 2019 · 7f1c0f6 · 7f1c0f6
2 parents 88f0493 + 2f58f41
commit 7f1c0f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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