From 3829b84e9927a2a77a7634a8e7b010cc57095e1b Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Fri, 8 Mar 2019 11:09:00 -0800 Subject: clang: fix `-Wsign-conversion` errors Cast some values as their unsigned equivalents or `size_t` to match the parameter type used for the template object under test. Also, provide UInt32 equivalent delegate methods for some callers (with int-equivalents for backwards compatibility). This closes #2146. Signed-off-by: Enji Cooper --- googletest/test/googletest-death-test-test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'googletest/test/googletest-death-test-test.cc') diff --git a/googletest/test/googletest-death-test-test.cc b/googletest/test/googletest-death-test-test.cc index b8645414..272b9c36 100644 --- a/googletest/test/googletest-death-test-test.cc +++ b/googletest/test/googletest-death-test-test.cc @@ -884,10 +884,12 @@ class MockDeathTestFactory : public DeathTestFactory { int AssumeRoleCalls() const { return assume_role_calls_; } int WaitCalls() const { return wait_calls_; } size_t PassedCalls() const { return passed_args_.size(); } - bool PassedArgument(int n) const { return passed_args_[n]; } + bool PassedArgument(int n) const { + return passed_args_[static_cast(n)]; + } size_t AbortCalls() const { return abort_args_.size(); } DeathTest::AbortReason AbortArgument(int n) const { - return abort_args_[n]; + return abort_args_[static_cast(n)]; } bool TestDeleted() const { return test_deleted_; } -- cgit v1.2.3