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

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

Merge "libsnapshot: fix -Wdefaulted-function-delete warnings." am: cd6f5799... 

Merge "libsnapshot: fix -Wdefaulted-function-delete warnings." am: cd6f5799 am: 20175896 am: 1c146563 am: b49d38c3 am: bdae6b0b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2176793



Change-Id: I4cb729bb90b9933a855cafd364a2b01ea74b3700
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d07b3218 bdae6b0b

fs_mgr/libsnapshot/utility.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ struct AutoUnmapDevice : AutoDevice { 
    // On destruct, delete |name| from device mapper.

    // On destruct, delete |name| from device mapper.

    AutoUnmapDevice(android::dm::IDeviceMapper* dm, const std::string& name)

    AutoUnmapDevice(android::dm::IDeviceMapper* dm, const std::string& name)

        : AutoDevice(name), dm_(dm) {}

        : AutoDevice(name), dm_(dm) {}

    AutoUnmapDevice(AutoUnmapDevice&& other) = default;

    ~AutoUnmapDevice();

    ~AutoUnmapDevice();





  private:

  private:
@@ -72,7 +71,6 @@ struct AutoUnmapImage : AutoDevice { 
    // On destruct, delete |name| from image manager.

    // On destruct, delete |name| from image manager.

    AutoUnmapImage(android::fiemap::IImageManager* images, const std::string& name)

    AutoUnmapImage(android::fiemap::IImageManager* images, const std::string& name)

        : AutoDevice(name), images_(images) {}

        : AutoDevice(name), images_(images) {}

    AutoUnmapImage(AutoUnmapImage&& other) = default;

    ~AutoUnmapImage();

    ~AutoUnmapImage();





  private:

  private:
@@ -86,7 +84,6 @@ struct AutoDeleteSnapshot : AutoDevice { 
    AutoDeleteSnapshot(SnapshotManager* manager, SnapshotManager::LockedFile* lock,

    AutoDeleteSnapshot(SnapshotManager* manager, SnapshotManager::LockedFile* lock,

                       const std::string& name)

                       const std::string& name)

        : AutoDevice(name), manager_(manager), lock_(lock) {}

        : AutoDevice(name), manager_(manager), lock_(lock) {}

    AutoDeleteSnapshot(AutoDeleteSnapshot&& other);

    ~AutoDeleteSnapshot();

    ~AutoDeleteSnapshot();





  private:

  private: