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

Commit cbefc991 authored by Vladimir Marko's avatar Vladimir Marko
Browse files

resolve merge conflicts of e546841c to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2fd7e30e097df769b302cec1b54b715a4a70ba90
parents 5f8d2168 e546841c

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ clang_format = true 
[Builtin Hooks Options]

# Only turn on clang-format check for the following subfolders.

clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp

               libs/binder/ndk/

               libs/graphicsenv/

               libs/gui/

               libs/renderengine/

libs/binder/ndk/include_ndk/android/binder_auto_utils.h

+1 −3
Original line number Diff line number Diff line
@@ -163,9 +163,7 @@ class ScopedAResource { 
    ScopedAResource& operator=(ScopedAResource&&) = delete;



    // move-constructing is okay

    ScopedAResource(ScopedAResource&& other) : mT(std::move(other.mT)) {

      other.mT = DEFAULT;

    }

    ScopedAResource(ScopedAResource&& other) : mT(std::move(other.mT)) { other.mT = DEFAULT; }



   private:

    T mT;