diff options
| author | Abseil Team <absl-team@google.com> | 2021-04-14 22:27:15 (GMT) |
|---|---|---|
| committer | Dino Radaković <dinor@google.com> | 2021-04-16 03:41:37 (GMT) |
| commit | 831bc03504b0946929bb05dcb323e3b2dc3d2bd5 (patch) | |
| tree | 62cb96b7e90937c1bdd0be91823ce8d6a3a66dcf /googletest | |
| parent | 8d664b94bebc86a9d3c6272bb41039310c550e58 (diff) | |
| download | googletest-831bc03504b0946929bb05dcb323e3b2dc3d2bd5.zip googletest-831bc03504b0946929bb05dcb323e3b2dc3d2bd5.tar.gz googletest-831bc03504b0946929bb05dcb323e3b2dc3d2bd5.tar.bz2 | |
Googletest export
Fix -Wconversion issues on Fuchsia
PiperOrigin-RevId: 368520510
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index cbc395b..d3d5feb 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -865,7 +865,7 @@ class Arguments { } int size() { - return args_.size() - 1; + return static_cast<int>(args_.size()) - 1; } private: @@ -959,7 +959,7 @@ int FuchsiaDeathTest::Wait() { GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK); GTEST_DEATH_TEST_CHECK_(buffer.flags & ZX_INFO_PROCESS_FLAG_EXITED); - set_status(buffer.return_code); + set_status(static_cast<int>(buffer.return_code)); return status(); } |