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

Commit c7ca08ca authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make ScopedFileDescriptor default ctor implicit" am: 084e1948 am:... 

Merge "Make ScopedFileDescriptor default ctor implicit" am: 084e1948 am: 37e8aa52 am: 983cf39a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1485444

Change-Id: I86f8387b2c653f0b589d5dbabb2a75b676c1676d
parents b06e5dce 983cf39a

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

+2 −1
Original line number Diff line number Diff line
@@ -313,7 +313,8 @@ class ScopedFileDescriptor : public impl::ScopedAResource<int, int, close, -1> { 
    /**

     * Takes ownership of a.

     */

    explicit ScopedFileDescriptor(int a = -1) : ScopedAResource(a) {}

    ScopedFileDescriptor() : ScopedFileDescriptor(-1) {}

    explicit ScopedFileDescriptor(int a) : ScopedAResource(a) {}

    ~ScopedFileDescriptor() {}

    ScopedFileDescriptor(ScopedFileDescriptor&&) = default;

    ScopedFileDescriptor& operator=(ScopedFileDescriptor&&) = default;