diff options
author | 2019-01-14 14:58:22 -0800 | |
---|---|---|
committer | 2019-01-14 14:58:22 -0800 | |
commit | bc807065993c2d37670443ddc6f41c06b55cc5d7 (patch) | |
tree | c39a71c10c7e409bdc4d80d03486605b4b9351e9 /libs/androidfw/ZipUtils.cpp | |
parent | 1c2ceb24ed5cbcf1843fba78c357ac3fa01bdb6a (diff) | |
parent | cd06f9ee04750c886d0a4d64cf49e938b57df75a (diff) |
Merge "Fix/suppress androidfw google-explicit-constructor warnings" am: 392f0052c2 am: 99a3d72b98
am: cd06f9ee04
Change-Id: I0340acdbd6530f9bd9f67333974bcc65ff97e0e5
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 { |