diff options
| author | Hans Boehm <hboehm@google.com> | 2014-07-23 11:35:13 -0700 |
|---|---|---|
| committer | Hans Boehm <hboehm@google.com> | 2014-07-23 11:35:13 -0700 |
| commit | 88b7541d682a6ad402eff15e58c9c792497096d7 (patch) | |
| tree | 48fd8c5b4989c9340a5dda4fdbe1bdaab7b198ae /include | |
| parent | 76cbbc07ea98d2a2f75173fe7ba5444d44ebd99f (diff) | |
| download | frameworks_native-88b7541d682a6ad402eff15e58c9c792497096d7.zip frameworks_native-88b7541d682a6ad402eff15e58c9c792497096d7.tar.gz frameworks_native-88b7541d682a6ad402eff15e58c9c792497096d7.tar.bz2 | |
Remove incorrect android_atomic_...64 use.
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.
Bug: 16513433
Change-Id: Ibabb88d05025187ee1ce6c7f1aa670b133a547f8
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/Binder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/binder/Binder.h b/include/binder/Binder.h index ba3ac4b..16f2c4a 100644 --- a/include/binder/Binder.h +++ b/include/binder/Binder.h @@ -17,6 +17,7 @@ #ifndef ANDROID_BINDER_H #define ANDROID_BINDER_H +#include <stdatomic.h> #include <binder/IBinder.h> // --------------------------------------------------------------------------- @@ -69,7 +70,7 @@ private: class Extras; - Extras* mExtras; + atomic_uintptr_t mExtras; // should be atomic<Extras *> void* mReserved0; }; |