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 am: a4e3d254b5

Browse Source 
Change-Id: I043c3982e5b2105ca484ec66cec60ad730a18c2f
This commit is contained in:
Automerger Merge Worker
2020-03-17 20:23:25 +00:00
parent 81b3112718 a4e3d254b5
commit df05de4afa
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); size = sizeof(android::ResTable_config);
} }
inline ConfigDescription::ConfigDescription(const ConfigDescription& o) { inline ConfigDescription::ConfigDescription(const ConfigDescription& o)
*static_cast<android::ResTable_config*>(this) = o; : android::ResTable_config(o) {
} }
inline ConfigDescription::ConfigDescription(ConfigDescription&& o) noexcept { 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); size = sizeof(android::ResTable_config);
} }
ConfigDescription(const ConfigDescription&o) { ConfigDescription(const ConfigDescription&o)
*static_cast<android::ResTable_config*>(this) = o; : android::ResTable_config(o) {
} }
ConfigDescription& operator=(const android::ResTable_config& o) { ConfigDescription& operator=(const android::ResTable_config& o) {