diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 11:50:23 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-20 21:04:35 +0000 |
| commit | 3bdc5b826803dca10d3625c56de38d6c55d869c8 (patch) | |
| tree | 03ada58b6a37174c7b612c0dfd32bed01c105e3d /libs | |
| parent | 947a6adf97d9ba86e3ef5704d523b4971246ff1e (diff) | |
| download | frameworks_native-3bdc5b826803dca10d3625c56de38d6c55d869c8.zip frameworks_native-3bdc5b826803dca10d3625c56de38d6c55d869c8.tar.gz frameworks_native-3bdc5b826803dca10d3625c56de38d6c55d869c8.tar.bz2 | |
C++11 compatibility.
* Explicit conversion for atomic_uintptr_t initialization.
* Fix string literal concatenation to not be a UD literal.
* Use __typeof__ instead of typeof (should become decltype once this
actually moves to C++11).
Bug: 18466763
Change-Id: I4eedddfb945a2a703ed27317cb6e2b3041b1ebfc
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/Binder.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 296a98b..9d200fb 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -72,7 +72,7 @@ public: BBinder::BBinder() { - atomic_init(&mExtras, 0); + atomic_init(&mExtras, static_cast<uintptr_t>(0)); } bool BBinder::isBinderAlive() const diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 1dbb06f..99e539c 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1452,7 +1452,7 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize, for (size_t i = 0; i < mObjectsSize; i++) { binder_size_t offset = mObjects[i]; if (offset < minOffset) { - ALOGE("%s: bad object offset %"PRIu64" < %"PRIu64"\n", + ALOGE("%s: bad object offset %" PRIu64 " < %" PRIu64 "\n", __func__, (uint64_t)offset, (uint64_t)minOffset); mObjectsSize = 0; break; |