Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1ced8bb authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am c894c204: Merge "C++11 compatibility." 

* commit 'c894c204':
  C++11 compatibility.
parents 8d84b6f9 c894c204

libs/binder/Binder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public: 


BBinder::BBinder()

{

    atomic_init(&mExtras, 0);

  atomic_init(&mExtras, static_cast<uintptr_t>(0));

}



bool BBinder::isBinderAlive() const

services/surfaceflinger/DdmConnection.cpp

+2 −2
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ void DdmConnection::start(const char* name) { 
    }



    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());



    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");

    ALOGE_IF(!registerNatives, "DdmConnection: %s", dlerror());

libs/binder/Parcel.cpp

+1 −1

File changed.

Contains only whitespace changes.