diff options
author | Lingfeng Yang <lfy@google.com> | 2019-05-22 15:57:06 (GMT) |
---|---|---|
committer | Lingfeng Yang <lfy@google.com> | 2019-05-22 15:57:06 (GMT) |
commit | 2f58f41d1a8c9140ae15cffbd498d57a1909e7e2 (patch) | |
tree | 66668a40598cb8fec3eb03e0e1338a0132fa4930 /googletest/src/gtest.cc | |
parent | f71fb4f9a912ec945401cc49a287a759b6131026 (diff) | |
download | googletest-2f58f41d1a8c9140ae15cffbd498d57a1909e7e2.zip googletest-2f58f41d1a8c9140ae15cffbd498d57a1909e7e2.tar.gz googletest-2f58f41d1a8c9140ae15cffbd498d57a1909e7e2.tar.bz2 |
unbreak windows buildrefs/pull/2260/head
windows msvc toolchain with werror and wconversion
will break if converting long to DWORD.
Diffstat (limited to 'googletest/src/gtest.cc')
-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 5998f9a..0da3cc2 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 |