diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-12-20 13:37:44 -0800 |
|---|---|---|
| committer | Chih-hung Hsieh <chh@google.com> | 2019-01-04 17:38:13 +0000 |
| commit | 1fc78e1814d6e1ad8d49e905a569d2589bbb2b8f (patch) | |
| tree | aed2dad2df847dd375759f3ab6378466a9abe482 /tools/aapt2/Resource.h | |
| parent | bd7379858523c4e06175ee6cd92b46750d05b1dd (diff) | |
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
Diffstat (limited to 'tools/aapt2/Resource.h')
| -rw-r--r-- | tools/aapt2/Resource.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/Resource.h b/tools/aapt2/Resource.h index 1c1aeddf158a..a8ba202d08f7 100644 --- a/tools/aapt2/Resource.h +++ b/tools/aapt2/Resource.h @@ -108,7 +108,7 @@ struct ResourceNameRef { ResourceNameRef() = default; ResourceNameRef(const ResourceNameRef&) = default; ResourceNameRef(ResourceNameRef&&) = default; - ResourceNameRef(const ResourceName& rhs); // NOLINT(implicit) + ResourceNameRef(const ResourceName& rhs); // NOLINT(google-explicit-constructor) ResourceNameRef(const android::StringPiece& p, ResourceType t, const android::StringPiece& e); ResourceNameRef& operator=(const ResourceNameRef& rhs) = default; ResourceNameRef& operator=(ResourceNameRef&& rhs) = default; @@ -139,7 +139,7 @@ struct ResourceId { ResourceId(); ResourceId(const ResourceId& rhs); - ResourceId(uint32_t res_id); // NOLINT(implicit) + ResourceId(uint32_t res_id); // NOLINT(google-explicit-constructor) ResourceId(uint8_t p, uint8_t t, uint16_t e); bool is_valid() const; |