diff options
author | Dan Albert <danalbert@google.com> | 2014-11-20 11:31:17 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-11-20 11:34:32 -0800 |
commit | 36802bd18b7b4e8c87fa019c7e3068bee330d174 (patch) | |
tree | a5c4847a10d5f77a04b9a621174a774d84cb7c31 /services/audioflinger/StateQueue.cpp | |
parent | de14fae779240a99c53d58ef16ce3086321ff897 (diff) | |
download | frameworks_av-36802bd18b7b4e8c87fa019c7e3068bee330d174.zip frameworks_av-36802bd18b7b4e8c87fa019c7e3068bee330d174.tar.gz frameworks_av-36802bd18b7b4e8c87fa019c7e3068bee330d174.tar.bz2 |
C++11 compatibility.
* Fix string literal concatenation to not be interpreted as UD
literals.
* Add constexpr compatibility for non-integral static members.
* Use __typeof__ instead of typeof (should become decltype once this
actually becomes C++11).
* Add an appropriate cast for atomic_uintptr_t, since moving to C++11
means moving from <stdatomic.h> to <atomic>, which has better
typechecking (hooray for not macros!).
Bug: 18466763
Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
Diffstat (limited to 'services/audioflinger/StateQueue.cpp')
-rw-r--r-- | services/audioflinger/StateQueue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/StateQueue.cpp b/services/audioflinger/StateQueue.cpp index 40d7bcd..9d4188f 100644 --- a/services/audioflinger/StateQueue.cpp +++ b/services/audioflinger/StateQueue.cpp @@ -48,7 +48,7 @@ template<typename T> StateQueue<T>::StateQueue() : , mObserverDump(&mObserverDummyDump), mMutatorDump(&mMutatorDummyDump) #endif { - atomic_init(&mNext, 0); + atomic_init(&mNext, static_cast<uintptr_t>(0)); } template<typename T> StateQueue<T>::~StateQueue() |