From 3fb38f7fe25a29084203a455d76f7af426e91549 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Tue, 10 Mar 2020 12:58:29 -0700 Subject: [PATCH] Fix bugprone-copy-constructor-init warnings * normally a copy constructor should call base copy constructor Bug: 151109313 Test: WITH_TIDY=1 make Change-Id: I9677889973178c26cd787a457333877619956b51 --- libs/androidfw/include/androidfw/ConfigDescription.h | 4 ++-- tools/aapt/ConfigDescription.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/androidfw/include/androidfw/ConfigDescription.h b/libs/androidfw/include/androidfw/ConfigDescription.h index 6fa089aeb12ca..acf413aeaf912 100644 --- a/libs/androidfw/include/androidfw/ConfigDescription.h +++ b/libs/androidfw/include/androidfw/ConfigDescription.h @@ -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(this) = o; +inline ConfigDescription::ConfigDescription(const ConfigDescription& o) + : android::ResTable_config(o) { } inline ConfigDescription::ConfigDescription(ConfigDescription&& o) noexcept { diff --git a/tools/aapt/ConfigDescription.h b/tools/aapt/ConfigDescription.h index b4ea624524b3e..6e9dc3d9456a5 100644 --- a/tools/aapt/ConfigDescription.h +++ b/tools/aapt/ConfigDescription.h @@ -34,8 +34,8 @@ struct ConfigDescription : public android::ResTable_config { size = sizeof(android::ResTable_config); } - ConfigDescription(const ConfigDescription&o) { - *static_cast(this) = o; + ConfigDescription(const ConfigDescription&o) + : android::ResTable_config(o) { } ConfigDescription& operator=(const android::ResTable_config& o) {