Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bugprone-copy-constructor-init warnings" am: 4dc2f8f773 am: 87158910b0

Browse Source 
Change-Id: I97aa5de85b497692a1ef9fc72d6b501a41782f59
This commit is contained in:
Automerger Merge Worker
2020-03-17 19:55:46 +00:00
parent a57bf9e404 87158910b0
commit dcead005f3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/androidfw/include/androidfw/ConfigDescription.h
View File

@@ -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 {

4
tools/aapt/ConfigDescription.h
View File

@@ -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) {