commit 695fddfbc43401ba868a30a086db9abab98fec75
author Chih-Hung Hsieh <chh@google.com> Tue Apr 26 00:46:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 26 00:46:45 2016 +0000
tree e5b79a54f59c65df7f9b4bae33add0b7051b87ac
parent 1a835344b7651b9bdd649672e8612cc97d1bbead
parent 0c1dfa6132412ab9c337abe9eb5332fc6d4fbb04

Merge "Fix google-explicit-constructor warnings."
am: e1d5c25

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

Change-Id: Ic44fbc1fd8e814861f2b4e314ab6552e59b87b0e

libziparchive/zip_archive_stream_entry.cc

diff --git a/libziparchive/zip_archive_stream_entry.cc b/libziparchive/zip_archive_stream_entry.cc
index f618835..4b205a7 100644
--- a/libziparchive/zip_archive_stream_entry.cc
+++ b/libziparchive/zip_archive_stream_entry.cc
@@ -48,7 +48,8 @@
 
 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 @@
 
 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 @@
 
 class ZipArchiveStreamEntryRawCompressed : public ZipArchiveStreamEntryUncompressed {
  public:
-  ZipArchiveStreamEntryRawCompressed(ZipArchiveHandle handle)
+  explicit ZipArchiveStreamEntryRawCompressed(ZipArchiveHandle handle)
       : ZipArchiveStreamEntryUncompressed(handle) {}
   virtual ~ZipArchiveStreamEntryRawCompressed() {}