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

Commit 87158910 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix bugprone-copy-constructor-init warnings" am: 4dc2f8f7 

Change-Id: I9b93f19ef77dad9b9138cfe74d6d6cc9845aa7f5
parents ee0f856d 4dc2f8f7

libs/androidfw/include/androidfw/ConfigDescription.h

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ inline ConfigDescription::ConfigDescription(const android::ResTable_config& o) { 
  size = sizeof(android::ResTable_config);

}



inline ConfigDescription::ConfigDescription(const ConfigDescription& o) {

  *static_cast<android::ResTable_config*>(this) = o;

inline ConfigDescription::ConfigDescription(const ConfigDescription& o)

  : android::ResTable_config(o) {

}



inline ConfigDescription::ConfigDescription(ConfigDescription&& o) noexcept {

tools/aapt/ConfigDescription.h

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ struct ConfigDescription : public android::ResTable_config { 
        size = sizeof(android::ResTable_config);

    }



    ConfigDescription(const ConfigDescription&o) {

        *static_cast<android::ResTable_config*>(this) = o;

    ConfigDescription(const ConfigDescription&o)

        : android::ResTable_config(o) {

    }



    ConfigDescription& operator=(const android::ResTable_config& o) {