diff options
| author | Hans Boehm <hboehm@google.com> | 2014-09-03 17:18:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 17:18:44 +0000 |
| commit | 98e56d926bce70a0a3257c573a92944c8057b528 (patch) | |
| tree | 04a6e72fc3040957e3c616790ce1353f1b750ab3 | |
| parent | 19f8b79f154b64c664e974f7be067d456c3d57e2 (diff) | |
| parent | 553231f65e4e8d20a6f665ba86e3785a7243595f (diff) | |
| download | frameworks_native-98e56d926bce70a0a3257c573a92944c8057b528.zip frameworks_native-98e56d926bce70a0a3257c573a92944c8057b528.tar.gz frameworks_native-98e56d926bce70a0a3257c573a92944c8057b528.tar.bz2 | |
Merge "Fix CAS argument type." into lmp-dev
| -rw-r--r-- | libs/binder/Binder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index d9d4971..2554351 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -144,7 +144,7 @@ void BBinder::attachObject( if (!e) { e = new Extras; - uintptr_t* expected = 0; + uintptr_t expected = 0; if (!atomic_compare_exchange_strong_explicit( &mExtras, &expected, reinterpret_cast<uintptr_t>(e), |