ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix google-explicit-constructor warnings."

Browse source 
am: e1d5c25

* commit 'e1d5c2548b9794c39d943205daad3be971e8bcfa':
  Fix google-explicit-constructor warnings.

Change-Id: Ic44fbc1fd8e814861f2b4e314ab6552e59b87b0e
This commit is contained in:
Chih-Hung Hsieh 2016-04-26 00:46:45 +00:00 • committed by android-build-merger
commit e641a2fa61
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libziparchive/zip_archive_stream_entry.cc
View file

@ -48,7 +48,8 @@ bool ZipArchiveStreamEntry::Init(const ZipEntry& entry) {
class ZipArchiveStreamEntryUncompressed : public ZipArchiveStreamEntry { class ZipArchiveStreamEntryUncompressed : public ZipArchiveStreamEntry {
public: public:
ZipArchiveStreamEntryUncompressed(ZipArchiveHandle handle) : ZipArchiveStreamEntry(handle) {} explicit ZipArchiveStreamEntryUncompressed(ZipArchiveHandle handle)
: ZipArchiveStreamEntry(handle) {}
virtual ~ZipArchiveStreamEntryUncompressed() {} virtual ~ZipArchiveStreamEntryUncompressed() {}
const std::vector<uint8_t>* Read() override; const std::vector<uint8_t>* Read() override;
@ -110,7 +111,8 @@ bool ZipArchiveStreamEntryUncompressed::Verify() {
class ZipArchiveStreamEntryCompressed : public ZipArchiveStreamEntry { class ZipArchiveStreamEntryCompressed : public ZipArchiveStreamEntry {
public: public:
ZipArchiveStreamEntryCompressed(ZipArchiveHandle handle) : ZipArchiveStreamEntry(handle) {} explicit ZipArchiveStreamEntryCompressed(ZipArchiveHandle handle)
: ZipArchiveStreamEntry(handle) {}
virtual ~ZipArchiveStreamEntryCompressed(); virtual ~ZipArchiveStreamEntryCompressed();
const std::vector<uint8_t>* Read() override; const std::vector<uint8_t>* Read() override;
@ -249,7 +251,7 @@ const std::vector<uint8_t>* ZipArchiveStreamEntryCompressed::Read() {
class ZipArchiveStreamEntryRawCompressed : public ZipArchiveStreamEntryUncompressed { class ZipArchiveStreamEntryRawCompressed : public ZipArchiveStreamEntryUncompressed {
public: public:
ZipArchiveStreamEntryRawCompressed(ZipArchiveHandle handle) explicit ZipArchiveStreamEntryRawCompressed(ZipArchiveHandle handle)
: ZipArchiveStreamEntryUncompressed(handle) {} : ZipArchiveStreamEntryUncompressed(handle) {}
virtual ~ZipArchiveStreamEntryRawCompressed() {} virtual ~ZipArchiveStreamEntryRawCompressed() {}