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

Commit d2639aa7 authored by Yi Kong's avatar Yi Kong
Browse files

Fix ctad-maybe-unsupported warning 

The upcoming compiler warns about the following code pattern:

frameworks/native/libs/gui/SurfaceComposerClient.cpp:192:5: error: 'lock_guard' may not intend to support class template argument deduction [-Werror,-Wctad-maybe-unsupported]                                                                                                                                                  std::lock_guard lock(mMutex);

Add explicit deduction guide to fix the warning.

Test: m checkbuild
Change-Id: I4b8b22cdd9b9714d0dfc56c1590a19fcdfbbeb07
parent fce78ba2

libs/gui/SurfaceComposerClient.cpp

+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ void TransactionCompletedListener::addSurfaceControlToCallbacks( 
}



void TransactionCompletedListener::onTransactionCompleted(ListenerStats listenerStats) {

    std::lock_guard lock(mMutex);

    std::lock_guard<std::mutex> lock(mMutex);



    /* This listener knows all the sp<IBinder> to sp<SurfaceControl> for all its registered

     * callbackIds, except for when Transactions are merged together. This probably cannot be
@@ -242,7 +242,7 @@ public: 
    }



    int32_t getId(const sp<GraphicBuffer>& buffer) {

        std::lock_guard lock(mMutex);

        std::lock_guard<std::mutex> lock(mMutex);



        auto itr = mBuffers.find(buffer);

        if (itr == mBuffers.end()) {
@@ -253,7 +253,7 @@ public: 
    }



    int32_t cache(const sp<GraphicBuffer>& buffer) {

        std::lock_guard lock(mMutex);

        std::lock_guard<std::mutex> lock(mMutex);



        int32_t bufferId = getNextAvailableId();