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

Commit 21223593 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Add default move assignment opperators to ScopedAResource types" am:...

Merge "Add default move assignment opperators to ScopedAResource types" am: 7f90426f am: 4bc1a78c am: 49fefe58 am: 911d10e9

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

Change-Id: I5e09ef0cc9add364a75d2da302d9adf2f0c1adc1
parents 616df6fc 911d10e9
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ class ScopedAParcel : public impl::ScopedAResource<AParcel*, void, AParcel_delet
    explicit ScopedAParcel(AParcel* a = nullptr) : ScopedAResource(a) {}
    ~ScopedAParcel() {}
    ScopedAParcel(ScopedAParcel&&) = default;
    ScopedAParcel& operator=(ScopedAParcel&&) = default;
};

/**
@@ -273,6 +274,7 @@ class ScopedAIBinder_DeathRecipient
        : ScopedAResource(a) {}
    ~ScopedAIBinder_DeathRecipient() {}
    ScopedAIBinder_DeathRecipient(ScopedAIBinder_DeathRecipient&&) = default;
    ScopedAIBinder_DeathRecipient& operator=(ScopedAIBinder_DeathRecipient&&) = default;
};

/**
@@ -287,6 +289,7 @@ class ScopedAIBinder_Weak
    explicit ScopedAIBinder_Weak(AIBinder_Weak* a = nullptr) : ScopedAResource(a) {}
    ~ScopedAIBinder_Weak() {}
    ScopedAIBinder_Weak(ScopedAIBinder_Weak&&) = default;
    ScopedAIBinder_Weak& operator=(ScopedAIBinder_Weak&&) = default;

    /**
     * See AIBinder_Weak_promote.
@@ -305,6 +308,7 @@ class ScopedFileDescriptor : public impl::ScopedAResource<int, int, close, -1> {
    explicit ScopedFileDescriptor(int a = -1) : ScopedAResource(a) {}
    ~ScopedFileDescriptor() {}
    ScopedFileDescriptor(ScopedFileDescriptor&&) = default;
    ScopedFileDescriptor& operator=(ScopedFileDescriptor&&) = default;
};

}  // namespace ndk