diff options
author | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
commit | afe96b6d4235b9d9fbfce2465f5c6d82c2611f48 (patch) | |
tree | d509cb3cc3f2b25b58a75563758d2092103ca19a /src/google/protobuf/util/internal/proto_writer.h | |
parent | 0400cca3236de1ca303af38bf81eab332d042b7c (diff) | |
parent | 89b5333ad0f10058d5af62701c5ebea0db376c5b (diff) |
Merge branch 'master' into down-integrate
Diffstat (limited to 'src/google/protobuf/util/internal/proto_writer.h')
-rw-r--r-- | src/google/protobuf/util/internal/proto_writer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/proto_writer.h b/src/google/protobuf/util/internal/proto_writer.h index 89ca0e86..28496963 100644 --- a/src/google/protobuf/util/internal/proto_writer.h +++ b/src/google/protobuf/util/internal/proto_writer.h @@ -309,7 +309,7 @@ class LIBPROTOBUF_EXPORT ProtoWriter : public StructuredObjectWriter { // Indicates whether we finished writing root message completely. bool done_; - // If true, don't report unknown field names to the listener. + // If true, don't report unknown field names and enum values to the listener. bool ignore_unknown_fields_; // If true, check if enum name in camel case or without underscore matches the |