ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "C++11 compatibility."

Browse Source
This commit is contained in:
Dan Albert 2014-11-20 22:06:43 +00:00 committed by Gerrit Code Review
commit c894c2045f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/binder/Binder.cpp
View File

@ -72,7 +72,7 @@ public:
BBinder::BBinder() BBinder::BBinder()
{ {
atomic_init(&mExtras, 0); atomic_init(&mExtras, static_cast<uintptr_t>(0));
} }
bool BBinder::isBinderAlive() const bool BBinder::isBinderAlive() const

2
libs/binder/Parcel.cpp
View File

@ -1452,7 +1452,7 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize,
for (size_t i = 0; i < mObjectsSize; i++) { for (size_t i = 0; i < mObjectsSize; i++) {
binder_size_t offset = mObjects[i]; binder_size_t offset = mObjects[i];
if (offset < minOffset) { 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); __func__, (uint64_t)offset, (uint64_t)minOffset);
mObjectsSize = 0; mObjectsSize = 0;
break; break;

4
services/surfaceflinger/DdmConnection.cpp
View File

@ -59,11 +59,11 @@ void DdmConnection::start(const char* name) {
} }
jint (*JNI_CreateJavaVM)(JavaVM** p_vm, JNIEnv** p_env, void* vm_args); jint (*JNI_CreateJavaVM)(JavaVM** p_vm, JNIEnv** p_env, void* vm_args);
JNI_CreateJavaVM = (typeof JNI_CreateJavaVM)dlsym(libart_dso, "JNI_CreateJavaVM"); JNI_CreateJavaVM = (__typeof__(JNI_CreateJavaVM))dlsym(libart_dso, "JNI_CreateJavaVM");
ALOGE_IF(!JNI_CreateJavaVM, "DdmConnection: %s", dlerror()); ALOGE_IF(!JNI_CreateJavaVM, "DdmConnection: %s", dlerror());
jint (*registerNatives)(JNIEnv* env, jclass clazz); jint (*registerNatives)(JNIEnv* env, jclass clazz);
registerNatives = (typeof registerNatives)dlsym(libandroid_runtime_dso, registerNatives = (__typeof__(registerNatives))dlsym(libandroid_runtime_dso,
"Java_com_android_internal_util_WithFramework_registerNatives"); "Java_com_android_internal_util_WithFramework_registerNatives");
ALOGE_IF(!registerNatives, "DdmConnection: %s", dlerror()); ALOGE_IF(!registerNatives, "DdmConnection: %s", dlerror());