diff options
| author | gennadiycivil <misterg@google.com> | 2019-05-23 16:20:24 -0400 |
|---|---|---|
| committer | gennadiycivil <misterg@google.com> | 2019-05-23 16:20:24 -0400 |
| commit | 7f1c0f6f8122d7978c9de29d9d468f7fac9ba62c (patch) | |
| tree | e168225a42847d3cbdd7345302bff50a69498bd4 | |
| parent | 88f0493098c8d9fd0f096c2158a0e56deb952d53 (diff) | |
| parent | 2f58f41d1a8c9140ae15cffbd498d57a1909e7e2 (diff) | |
| download | googletest-7f1c0f6f8122d7978c9de29d9d468f7fac9ba62c.tar.gz googletest-7f1c0f6f8122d7978c9de29d9d468f7fac9ba62c.tar.bz2 googletest-7f1c0f6f8122d7978c9de29d9d468f7fac9ba62c.zip | |
Merge pull request #2260 from 741g:master
PiperOrigin-RevId: 249660276
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 5998f9a3..0da3cc20 100644 --- 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 |