diff options
author | Enji Cooper <yaneurabeya@gmail.com> | 2019-03-08 11:09:00 -0800 |
---|---|---|
committer | Enji Cooper <yaneurabeya@gmail.com> | 2019-04-05 21:30:19 -0700 |
commit | 3829b84e9927a2a77a7634a8e7b010cc57095e1b (patch) | |
tree | 14762102e4f3bb5c34ff91711ce181a95574b812 /googletest/test/googletest-death-test-test.cc | |
parent | 5ba69d5cb93779fba14bf438dfdaf589e2b92071 (diff) | |
download | googletest-3829b84e9927a2a77a7634a8e7b010cc57095e1b.tar.gz googletest-3829b84e9927a2a77a7634a8e7b010cc57095e1b.tar.bz2 googletest-3829b84e9927a2a77a7634a8e7b010cc57095e1b.zip |
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 <yaneurabeya@gmail.com>
Diffstat (limited to 'googletest/test/googletest-death-test-test.cc')
-rw-r--r-- | googletest/test/googletest-death-test-test.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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<size_t>(n)]; + } size_t AbortCalls() const { return abort_args_.size(); } DeathTest::AbortReason AbortArgument(int n) const { - return abort_args_[n]; + return abort_args_[static_cast<size_t>(n)]; } bool TestDeleted() const { return test_deleted_; } |