diff options
| author | Hans Boehm <hboehm@google.com> | 2014-08-12 22:56:00 +0000 |
|---|---|---|
| committer | Hans Boehm <hboehm@google.com> | 2014-09-02 16:11:46 -0700 |
| commit | 08ff802151ea3089a5f352dfc795c99017c1d122 (patch) | |
| tree | 23d9af48933c3416aacf7836228b83c441d115cd /include | |
| parent | bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2 (diff) | |
| download | frameworks_native-08ff802151ea3089a5f352dfc795c99017c1d122.zip frameworks_native-08ff802151ea3089a5f352dfc795c99017c1d122.tar.gz frameworks_native-08ff802151ea3089a5f352dfc795c99017c1d122.tar.bz2 | |
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
After fixing b/16874785.
This reverts commit f010a05c7e9a23b6083294aff4a8183ab01f686e.
Original comment, which actually describes the effect of this:
Change the mExtras field in Binder.h to be a stdatomic.h atomic
value, and replace references to it with proper stdatomic.h calls.
This removes one of a small number of remaining 64 bit
android_atomic references. It also replaces the erroneously
non-atomic read accesses to mExtras.
It would be better if this used the C++11 <atomic> facility,
but we don't quite have that yet.
Fixes
Bug:16513433
Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
(cherry picked from commit 3effababf2980d029339522fdc914bdeb913d99b)
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/Binder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/binder/Binder.h b/include/binder/Binder.h index ba3ac4b..86628a0 100644 --- a/include/binder/Binder.h +++ b/include/binder/Binder.h @@ -17,6 +17,8 @@ #ifndef ANDROID_BINDER_H #define ANDROID_BINDER_H +#include <stdatomic.h> +#include <stdint.h> #include <binder/IBinder.h> // --------------------------------------------------------------------------- @@ -69,7 +71,7 @@ private: class Extras; - Extras* mExtras; + atomic_uintptr_t mExtras; // should be atomic<Extras *> void* mReserved0; }; |