diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2019-01-04 12:20:01 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-04 12:20:01 -0800 |
| commit | 3b3be3f10f666f0c9fc368d0567466ee9bb8cc68 (patch) | |
| tree | f1a91f4089ea24dea0d4ce26dc3f950867205e93 /tools/aapt2/Resource.h | |
| parent | e2ad62f797d794717790ee955c09dd378a4c74bf (diff) | |
| parent | 0bf62f1309fc279039b98a5faaa999ac95f9ee24 (diff) | |
Merge "Fix/suppress aapt/aapt2 google-explicit-constructor warnings" am: cdf6be573f am: d42fe48c93
am: 0bf62f1309
Change-Id: Iffb7e4a145b172a35dd58b9450d4a5184d8b07f7
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 dd5c751967b8..67ba895e51d1 100644 --- a/tools/aapt2/Resource.h +++ b/tools/aapt2/Resource.h @@ -113,7 +113,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; @@ -144,7 +144,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; |