diff options
| author | Riley Andrews <riandrews@google.com> | 2015-01-13 22:00:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-13 22:00:24 +0000 |
| commit | 41a160c4cda1ef2c916028ec2d0801da738b5249 (patch) | |
| tree | b658690198a14ec9dfc27be51a0462a5d0782f36 | |
| parent | 6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a (diff) | |
| parent | 50bcb00a9112b70183f7826675d8455cfd978e6a (diff) | |
| download | frameworks_native-41a160c4cda1ef2c916028ec2d0801da738b5249.zip frameworks_native-41a160c4cda1ef2c916028ec2d0801da738b5249.tar.gz frameworks_native-41a160c4cda1ef2c916028ec2d0801da738b5249.tar.bz2 | |
Merge "Fix signed/unsigned comparison warnings in driver interface test."
| -rw-r--r-- | libs/binder/tests/binderDriverInterfaceTest.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/binder/tests/binderDriverInterfaceTest.cpp b/libs/binder/tests/binderDriverInterfaceTest.cpp index acb7d49..64a6c91 100644 --- a/libs/binder/tests/binderDriverInterfaceTest.cpp +++ b/libs/binder/tests/binderDriverInterfaceTest.cpp @@ -114,7 +114,7 @@ class BinderDriverInterfaceTest : public ::testing::Test { bwr.read_buffer = (intptr_t)br; bwr.read_size = sizeof(br); binderTestIoctlErr1(BINDER_WRITE_READ, &bwr, EAGAIN); - EXPECT_EQ(0, bwr.read_consumed); + EXPECT_EQ(0u, bwr.read_consumed); for (i = 0; i * sizeof(uint32_t) < bwr.read_consumed; i++) { SCOPED_TRACE(testing::Message() << "i = " << i); EXPECT_EQ(BR_NOOP, br[i]); @@ -264,12 +264,12 @@ TEST_F(BinderDriverInterfaceTest, Transaction) { if (bwr.read_consumed > offsetof(typeof(br), cmd2)) EXPECT_EQ(BR_REPLY, br.cmd2); if (bwr.read_consumed >= offsetof(typeof(br), pad)) { - EXPECT_EQ(0, br.arg2.target.ptr); - EXPECT_EQ(0, br.arg2.cookie); - EXPECT_EQ(0, br.arg2.code); - EXPECT_EQ(0, br.arg2.flags); - EXPECT_EQ(0, br.arg2.data_size); - EXPECT_EQ(0, br.arg2.offsets_size); + EXPECT_EQ(0u, br.arg2.target.ptr); + EXPECT_EQ(0u, br.arg2.cookie); + EXPECT_EQ(0u, br.arg2.code); + EXPECT_EQ(0u, br.arg2.flags); + EXPECT_EQ(0u, br.arg2.data_size); + EXPECT_EQ(0u, br.arg2.offsets_size); SCOPED_TRACE("3rd WriteRead"); |