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

Commit d08b1e40 authored by Ytai Ben-Tsvi's avatar Ytai Ben-Tsvi
Browse files

Make ScopedFileDescriptor default ctor implicit 

Having the default ctor marked explicit causes problems initializing
it using the {} syntax, which occurs, e.g. in
binder_parcel_utils.h:483

Without this change, compilation fails with:
"chosen constructor is explicit in copy-initialization"

Test: compiles
Change-Id: Ic261a3d9ce4bbd7d3d54402ccdcc4d4e02add271
parent 1111ce4a

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;