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

Commit 3bdc5b82 authored by Dan Albert's avatar Dan Albert
Browse files

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
parent 947a6adf

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.