summaryrefslogtreecommitdiff
path: root/upb/msg.c
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2018-03-06 23:59:58 +0000
committerBo Yang <teboring@google.com>2018-03-07 00:12:28 +0000
commitcafebf6beede670a10535809667ac9b9f3033091 (patch)
treebe9f5460fa96e5e8690f5230a779d64c74e6abd8 /upb/msg.c
parentbcb62b7fbfb0c959f7d3671b40c1b7efbb3a4156 (diff)
For encoding upb needs descriptor type instead of type.
Diffstat (limited to 'upb/msg.c')
-rw-r--r--upb/msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/upb/msg.c b/upb/msg.c
index b3b0420..a146e0c 100644
--- a/upb/msg.c
+++ b/upb/msg.c
@@ -77,7 +77,7 @@ static uint8_t upb_msg_fieldsize(const upb_msglayout_fieldinit_v1 *field) {
if (field->label == UPB_LABEL_REPEATED) {
return sizeof(void*);
} else {
- return upb_msgval_sizeof(field->type);
+ return upb_msgval_sizeof(upb_desctype_to_fieldtype[field->descriptortype]);
}
}
@@ -284,7 +284,7 @@ static upb_msglayout *upb_msglayout_new(const upb_msgdef *m) {
upb_msglayout_fieldinit_v1 *field = &fields[upb_fielddef_index(f)];
field->number = upb_fielddef_number(f);
- field->type = upb_fielddef_type(f);
+ field->descriptortype = upb_fielddef_descriptortype(f);
field->label = upb_fielddef_label(f);
if (upb_fielddef_containingoneof(f)) {
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback