diff options
| author | Riley Andrews <riandrews@google.com> | 2015-01-13 23:26:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-13 23:26:02 +0000 |
| commit | 15411a00e15ecb169b3ee8251aac01cfa4b4fb84 (patch) | |
| tree | 7e50ea016d14755d36f3da87956631016721c5cd /libs/binder | |
| parent | d66ba5209a8bb10abd7514544159a19fedd81e52 (diff) | |
| parent | aec922426620804768f00a6c5cb902f278f2967f (diff) | |
| download | frameworks_native-15411a00e15ecb169b3ee8251aac01cfa4b4fb84.zip frameworks_native-15411a00e15ecb169b3ee8251aac01cfa4b4fb84.tar.gz frameworks_native-15411a00e15ecb169b3ee8251aac01cfa4b4fb84.tar.bz2 | |
am aec92242: Merge "Replace all instances of intptr_t with uintptr_t."
* commit 'aec922426620804768f00a6c5cb902f278f2967f':
Replace all instances of intptr_t with uintptr_t.
Diffstat (limited to 'libs/binder')
| -rw-r--r-- | libs/binder/tests/binderDriverInterfaceTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/binder/tests/binderDriverInterfaceTest.cpp b/libs/binder/tests/binderDriverInterfaceTest.cpp index 64a6c91..315f349 100644 --- a/libs/binder/tests/binderDriverInterfaceTest.cpp +++ b/libs/binder/tests/binderDriverInterfaceTest.cpp @@ -58,7 +58,7 @@ class BinderDriverInterfaceTestEnv : public ::testing::Environment { BC_ENTER_LOOPER, }; struct binder_write_read bwr = binder_write_read(); - bwr.write_buffer = (intptr_t)bc; + bwr.write_buffer = (uintptr_t)bc; bwr.write_size = sizeof(bc); ret = ioctl(m_binderFd, BINDER_WRITE_READ, &bwr); EXPECT_EQ(0, ret); @@ -111,7 +111,7 @@ class BinderDriverInterfaceTest : public ::testing::Test { uint32_t br[32]; struct binder_write_read bwr = binder_write_read(); SCOPED_TRACE("TestReadEmpty"); - bwr.read_buffer = (intptr_t)br; + bwr.read_buffer = (uintptr_t)br; bwr.read_size = sizeof(br); binderTestIoctlErr1(BINDER_WRITE_READ, &bwr, EAGAIN); EXPECT_EQ(0u, bwr.read_consumed); @@ -206,7 +206,7 @@ TEST_F(BinderDriverInterfaceTest, IncRefsAcquireReleaseDecRefs) { 0, }; struct binder_write_read bwr = binder_write_read(); - bwr.write_buffer = (intptr_t)bc; + bwr.write_buffer = (uintptr_t)bc; bwr.write_size = sizeof(bc); binderTestIoctl(BINDER_WRITE_READ, &bwr); EXPECT_EQ(sizeof(bc), bwr.write_consumed); @@ -241,9 +241,9 @@ TEST_F(BinderDriverInterfaceTest, Transaction) { } __attribute__((packed)) br; struct binder_write_read bwr = binder_write_read(); - bwr.write_buffer = (intptr_t)&bc1; + bwr.write_buffer = (uintptr_t)&bc1; bwr.write_size = sizeof(bc1); - bwr.read_buffer = (intptr_t)&br; + bwr.read_buffer = (uintptr_t)&br; bwr.read_size = sizeof(br); { @@ -283,7 +283,7 @@ TEST_F(BinderDriverInterfaceTest, Transaction) { .arg1 = br.arg2.data.ptr.buffer, }; - bwr.write_buffer = (intptr_t)&bc2; + bwr.write_buffer = (uintptr_t)&bc2; bwr.write_size = sizeof(bc2); bwr.write_consumed = 0; bwr.read_size = 0; @@ -329,9 +329,9 @@ TEST_F(BinderDriverInterfaceTest, RequestDeathNotification) { } __attribute__((packed)) br; struct binder_write_read bwr = binder_write_read(); - bwr.write_buffer = (intptr_t)&bc; + bwr.write_buffer = (uintptr_t)&bc; bwr.write_size = sizeof(bc); - bwr.read_buffer = (intptr_t)&br; + bwr.read_buffer = (uintptr_t)&br; bwr.read_size = sizeof(br); binderTestIoctl(BINDER_WRITE_READ, &bwr); |