diff options
| author | Hans Boehm <hboehm@google.com> | 2014-08-19 22:15:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:28:29 +0000 |
| commit | efc0b35fbd256bb3e225f4a1b953d0895ee3e99a (patch) | |
| tree | d3a2ee9f39a35f325b1273bd8625199d4f5d48a0 /libs/binder | |
| parent | 703b60ce39e52d319074adf53704d33f9c16dbbd (diff) | |
| parent | 1ddaadb59883df5ca821b4b08fdd41a1720a3b6f (diff) | |
| download | frameworks_native-efc0b35fbd256bb3e225f4a1b953d0895ee3e99a.zip frameworks_native-efc0b35fbd256bb3e225f4a1b953d0895ee3e99a.tar.gz frameworks_native-efc0b35fbd256bb3e225f4a1b953d0895ee3e99a.tar.bz2 | |
Merge "Fix CAS argument type."
Diffstat (limited to 'libs/binder')
| -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), |