From 1fc78e1814d6e1ad8d49e905a569d2589bbb2b8f Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 20 Dec 2018 13:37:44 -0800 Subject: Fix/suppress aapt/aapt2 google-explicit-constructor warnings * Add explicit to conversion constructors/operators * Use NOLINT or NOLINTNEXTLINE to suppress warnings on intended converters Bug: 28341362 Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,google-explicit-constructor Change-Id: Ie02101ea7c422e8add535c111a30a2f21ead0ace --- tools/aapt2/java/ProguardRules.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/aapt2/java') diff --git a/tools/aapt2/java/ProguardRules.h b/tools/aapt2/java/ProguardRules.h index 46827ee7cf93..c53f3076d85e 100644 --- a/tools/aapt2/java/ProguardRules.h +++ b/tools/aapt2/java/ProguardRules.h @@ -44,7 +44,7 @@ class KeepSet { public: KeepSet() = default; - KeepSet(bool conditional_keep_rules) : conditional_keep_rules_(conditional_keep_rules) { + explicit KeepSet(bool conditional_keep_rules) : conditional_keep_rules_(conditional_keep_rules) { } inline void AddManifestClass(const UsageLocation& file, const std::string& class_name) { -- cgit v1.2.3-59-g8ed1b