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

Commit 798006e4 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am ad3f86a5: Merge "Fixed x86 GCC 4.6 compilation error about unused variable" 

* commit 'ad3f86a5':
  Fixed x86 GCC 4.6 compilation error about unused variable
parents ee50eec0 ad3f86a5

libs/rs/driver/rsdCore.cpp

+1 −2
Original line number Diff line number Diff line
@@ -274,10 +274,9 @@ void Shutdown(Context *rsc) { 
    for (uint32_t ct = 0; ct < dc->mWorkers.mCount; ct++) {

        dc->mWorkers.mLaunchSignals[ct].set();

    }

    int status;

    void *res;

    for (uint32_t ct = 0; ct < dc->mWorkers.mCount; ct++) {

        status = pthread_join(dc->mWorkers.mThreadId[ct], &res);

        pthread_join(dc->mWorkers.mThreadId[ct], &res);

    }

    rsAssert(android_atomic_acquire_load(&dc->mWorkers.mRunningCount) == 0);