diff options
| author | 2019-01-14 14:16:59 -0800 | |
|---|---|---|
| committer | 2019-01-14 14:16:59 -0800 | |
| commit | cd06f9ee04750c886d0a4d64cf49e938b57df75a (patch) | |
| tree | 7afe9c85f97da33cdaf0c72a4d15243d23e7fb40 /libs/androidfw/ZipUtils.cpp | |
| parent | d887e0f5f97ef81f98d829e59944ca0bf3d79e76 (diff) | |
| parent | 99a3d72b9855c96b3a1c96aa87f36b6bf3908635 (diff) | |
Merge "Fix/suppress androidfw google-explicit-constructor warnings" am: 392f0052c2
am: 99a3d72b98
Change-Id: Icb12400292dae8ed091f1a55eb2f0a7e50e84667
Diffstat (limited to 'libs/androidfw/ZipUtils.cpp')
| -rw-r--r-- | libs/androidfw/ZipUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ZipUtils.cpp b/libs/androidfw/ZipUtils.cpp index 5d243da2097c..5be2105fe404 100644 --- a/libs/androidfw/ZipUtils.cpp +++ b/libs/androidfw/ZipUtils.cpp @@ -37,7 +37,7 @@ using namespace android; // TODO: This can go away once the only remaining usage in aapt goes away. class FileReader : public zip_archive::Reader { public: - FileReader(FILE* fp) : Reader(), mFp(fp), mCurrentOffset(0) { + explicit FileReader(FILE* fp) : Reader(), mFp(fp), mCurrentOffset(0) { } bool ReadAtOffset(uint8_t* buf, size_t len, uint32_t offset) const { |