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/cmd/Link.cpp | |
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/cmd/Link.cpp')
-rw-r--r-- | tools/aapt2/cmd/Link.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index f5b7acf36859..729447ee1de5 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -78,7 +78,7 @@ namespace aapt { class LinkContext : public IAaptContext { public: - LinkContext(IDiagnostics* diagnostics) + explicit LinkContext(IDiagnostics* diagnostics) : diagnostics_(diagnostics), name_mangler_({}), symbols_(&name_mangler_) { } @@ -163,7 +163,7 @@ class LinkContext : public IAaptContext { // See b/37498913. class FeatureSplitSymbolTableDelegate : public DefaultSymbolTableDelegate { public: - FeatureSplitSymbolTableDelegate(IAaptContext* context) : context_(context) { + explicit FeatureSplitSymbolTableDelegate(IAaptContext* context) : context_(context) { } virtual ~FeatureSplitSymbolTableDelegate() = default; |