diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:00:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:00:48 +0000 |
| commit | c1ced8bbcd0ab8ddb75513290954e8a56f80040e (patch) | |
| tree | d0754c77c90060886cab169d0b22aae616fc2587 /libs | |
| parent | 8d84b6f9f576fe51b2cb4a54042bf95af923e55b (diff) | |
| parent | c894c2045f589571c80af0648e7a9dcd7e97b6a8 (diff) | |
| download | frameworks_native-c1ced8bbcd0ab8ddb75513290954e8a56f80040e.zip frameworks_native-c1ced8bbcd0ab8ddb75513290954e8a56f80040e.tar.gz frameworks_native-c1ced8bbcd0ab8ddb75513290954e8a56f80040e.tar.bz2 | |
am c894c204: Merge "C++11 compatibility."
* commit 'c894c2045f589571c80af0648e7a9dcd7e97b6a8':
C++11 compatibility.
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 e7589b1..c613fe7 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1438,7 +1438,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; |