aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jisi Liu <liujisi@google.com>2017-10-19 10:56:03 -0700
committerGravatar GitHub <noreply@github.com>2017-10-19 10:56:03 -0700
commit09e0dbcf8f8a078070921e18b0592dbe7f9628df (patch)
tree2b36328a45fa8c93302b437ec9e18f2fd47d2063
parent2a142140453248fc49915c4a24561a84a24540ef (diff)
parent38fd94e184dfae01171a11fa1b7bb82ac9a72583 (diff)
Merge pull request #3743 from Schtolc/master
CodedInputStream::SetTotalBytesLimit description fix
-rw-r--r--src/google/protobuf/io/coded_stream.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/io/coded_stream.h b/src/google/protobuf/io/coded_stream.h
index 3d30fac1..02d87ea4 100644
--- a/src/google/protobuf/io/coded_stream.h
+++ b/src/google/protobuf/io/coded_stream.h
@@ -396,9 +396,9 @@ class LIBPROTOBUF_EXPORT CodedInputStream {
// Message::ParseFromString(). In this case, you will need to change
// your code to instead construct some sort of ZeroCopyInputStream
// (e.g. an ArrayInputStream), construct a CodedInputStream around
- // that, then call Message::ParseFromCodedStream() instead. Then
- // you can adjust the limit. Yes, it's more work, but you're doing
- // something unusual.
+ // that, then you can adjust the limit. Then call
+ // Message::ParseFromCodedStream() instead. Yes, it's more work, but
+ // you're doing something unusual.
void SetTotalBytesLimit(int total_bytes_limit, int warning_threshold);
// The Total Bytes Limit minus the Current Position, or -1 if there