diff options
| author | 2016-08-12 18:05:32 +0000 | |
|---|---|---|
| committer | 2016-08-12 18:05:32 +0000 | |
| commit | 17bd236b4b6b78c32a187649aa4abcf94e5951c3 (patch) | |
| tree | 3776aabd2d84938c13edf1644cbdb7044d5bbd65 /tools/aapt2/ResourceTable.cpp | |
| parent | 76ce8e52422bc6121fb974ef6aab040bb5d9da51 (diff) | |
| parent | 8bd37ba458633ee7b2aeec0a7593817000aa84b2 (diff) | |
Merge "Fix clang-tidy warnings in aapt and aapt2."
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt2/ResourceTable.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp index c93ecc768022..eeec8da3a1eb 100644 --- a/tools/aapt2/ResourceTable.cpp +++ b/tools/aapt2/ResourceTable.cpp @@ -151,7 +151,7 @@ bool ResourceTable::addResource(const ResourceNameRef& name, const ConfigDescrip return addResourceImpl(name, ResourceId{}, config, source, std::move(value), kValidNameChars); } -bool ResourceTable::addResource(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::addResource(const ResourceNameRef& name, const ResourceId& resId, const ConfigDescription& config, const SourceLine& source, std::unique_ptr<Value> value) { return addResourceImpl(name, resId, config, source, std::move(value), kValidNameChars); @@ -165,7 +165,7 @@ bool ResourceTable::addResourceAllowMangled(const ResourceNameRef& name, kValidNameMangledChars); } -bool ResourceTable::addResourceImpl(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::addResourceImpl(const ResourceNameRef& name, const ResourceId& resId, const ConfigDescription& config, const SourceLine& source, std::unique_ptr<Value> value, const char16_t* validChars) { if (!name.package.empty() && name.package != mPackage) { @@ -255,17 +255,17 @@ bool ResourceTable::addResourceImpl(const ResourceNameRef& name, const ResourceI return true; } -bool ResourceTable::markPublic(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::markPublic(const ResourceNameRef& name, const ResourceId& resId, const SourceLine& source) { return markPublicImpl(name, resId, source, kValidNameChars); } -bool ResourceTable::markPublicAllowMangled(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::markPublicAllowMangled(const ResourceNameRef& name, const ResourceId& resId, const SourceLine& source) { return markPublicImpl(name, resId, source, kValidNameMangledChars); } -bool ResourceTable::markPublicImpl(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::markPublicImpl(const ResourceNameRef& name, const ResourceId& resId, const SourceLine& source, const char16_t* validChars) { if (!name.package.empty() && name.package != mPackage) { Logger::error(source) |