diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-09-07 16:15:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 16:15:38 -0700 |
| commit | f9d8138376765d229a32635c9209061e4e4aed8c (patch) | |
| tree | 50719686fd7262f405c9bda8694d6c72e7c038b8 /src/google/protobuf/compiler/zip_writer.h | |
| parent | 2e7563f40ec7f901ae8ae1cc749d701fa07e211d (diff) | |
| parent | e53be9bce4556cf0d13e24f1a25a7d75f663144f (diff) | |
| download | protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.gz protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.bz2 protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.zip | |
Merge pull request #5109 from haberman/integrate
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/compiler/zip_writer.h')
| -rw-r--r-- | src/google/protobuf/compiler/zip_writer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/zip_writer.h b/src/google/protobuf/compiler/zip_writer.h index 03db4d57..a99bb78c 100644 --- a/src/google/protobuf/compiler/zip_writer.h +++ b/src/google/protobuf/compiler/zip_writer.h @@ -73,12 +73,12 @@ class ZipWriter { ZipWriter(io::ZeroCopyOutputStream* raw_output); ~ZipWriter(); - bool Write(const string& filename, const string& contents); + bool Write(const std::string& filename, const std::string& contents); bool WriteDirectory(); private: struct FileInfo { - string name; + std::string name; uint32 offset; uint32 size; uint32 crc32; |