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/io/coded_stream_inl.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/io/coded_stream_inl.h')
| -rw-r--r-- | src/google/protobuf/io/coded_stream_inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/io/coded_stream_inl.h b/src/google/protobuf/io/coded_stream_inl.h index d95b06e0..df66282a 100644 --- a/src/google/protobuf/io/coded_stream_inl.h +++ b/src/google/protobuf/io/coded_stream_inl.h @@ -47,7 +47,7 @@ namespace google { namespace protobuf { namespace io { -inline bool CodedInputStream::InternalReadStringInline(string* buffer, +inline bool CodedInputStream::InternalReadStringInline(std::string* buffer, int size) { if (size < 0) return false; // security: size is often user-supplied |