Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1d5c254 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix google-explicit-constructor warnings."

parents 47f808d0 3a114e0a

libziparchive/zip_archive_stream_entry.cc

+5 −3
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ bool ZipArchiveStreamEntry::Init(const ZipEntry& entry) { 


class ZipArchiveStreamEntryUncompressed : public ZipArchiveStreamEntry {

 public:

  ZipArchiveStreamEntryUncompressed(ZipArchiveHandle handle) : ZipArchiveStreamEntry(handle) {}

  explicit ZipArchiveStreamEntryUncompressed(ZipArchiveHandle handle)

      : ZipArchiveStreamEntry(handle) {}

  virtual ~ZipArchiveStreamEntryUncompressed() {}



  const std::vector<uint8_t>* Read() override;
@@ -110,7 +111,8 @@ bool ZipArchiveStreamEntryUncompressed::Verify() { 


class ZipArchiveStreamEntryCompressed : public ZipArchiveStreamEntry {

 public:

  ZipArchiveStreamEntryCompressed(ZipArchiveHandle handle) : ZipArchiveStreamEntry(handle) {}

  explicit ZipArchiveStreamEntryCompressed(ZipArchiveHandle handle)

      : ZipArchiveStreamEntry(handle) {}

  virtual ~ZipArchiveStreamEntryCompressed();



  const std::vector<uint8_t>* Read() override;
@@ -249,7 +251,7 @@ const std::vector<uint8_t>* ZipArchiveStreamEntryCompressed::Read() { 


class ZipArchiveStreamEntryRawCompressed : public ZipArchiveStreamEntryUncompressed {

 public:

  ZipArchiveStreamEntryRawCompressed(ZipArchiveHandle handle)

  explicit ZipArchiveStreamEntryRawCompressed(ZipArchiveHandle handle)

      : ZipArchiveStreamEntryUncompressed(handle) {}

  virtual ~ZipArchiveStreamEntryRawCompressed() {}