From 831bc03504b0946929bb05dcb323e3b2dc3d2bd5 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 14 Apr 2021 15:27:15 -0700 Subject: [PATCH] Googletest export Fix -Wconversion issues on Fuchsia PiperOrigin-RevId: 368520510 --- googletest/src/gtest-death-test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index cbc395b2..d3d5feb7 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(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(buffer.return_code)); return status(); }