aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/wire_format.h
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2015-06-15 16:54:02 -0700
committerBo Yang <teboring@google.com>2015-06-15 17:19:35 -0700
commita269a6d397b5bee9df0a73f186400ba2228a68d4 (patch)
treead111c1e0ca58198cd488a724ef655c2333b119f /src/google/protobuf/wire_format.h
parent4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff)
downloadprotobuf-a269a6d397b5bee9df0a73f186400ba2228a68d4.tar.gz
protobuf-a269a6d397b5bee9df0a73f186400ba2228a68d4.tar.bz2
protobuf-a269a6d397b5bee9df0a73f186400ba2228a68d4.zip
Implement parsing for proto3 primitive repeated fields. Previously, for
proto3 primitive repeated fields, packed data cannot be parsed if definition is unpacked. Neither is the other way.
Diffstat (limited to 'src/google/protobuf/wire_format.h')
-rw-r--r--src/google/protobuf/wire_format.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h
index 8de491a6..84270fee 100644
--- a/src/google/protobuf/wire_format.h
+++ b/src/google/protobuf/wire_format.h
@@ -290,7 +290,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSetFieldSkipper : public FieldSkipper {
inline WireFormatLite::WireType WireFormat::WireTypeForField(
const FieldDescriptor* field) {
- if (field->options().packed()) {
+ if (field->is_packed()) {
return WireFormatLite::WIRETYPE_LENGTH_DELIMITED;
} else {
return WireTypeForFieldType(field->type());