diff options
Diffstat (limited to 'upb/bindings/googlepb')
-rw-r--r-- | upb/bindings/googlepb/bridge.cc | 2 | ||||
-rw-r--r-- | upb/bindings/googlepb/proto2.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/upb/bindings/googlepb/bridge.cc b/upb/bindings/googlepb/bridge.cc index 2a2bbbf..394f7b4 100644 --- a/upb/bindings/googlepb/bridge.cc +++ b/upb/bindings/googlepb/bridge.cc @@ -99,7 +99,7 @@ const MessageDef* DefBuilder::GetMaybeUnfrozenMessageDef( fields.push_back(d->field(i)); } - for (int i = 0; i < fields.size(); i++) { + for (size_t i = 0; i < fields.size(); i++) { const goog::FieldDescriptor* proto2_f = fields[i]; assert(proto2_f); md->AddField(NewFieldDef(proto2_f, m), &status); diff --git a/upb/bindings/googlepb/proto2.cc b/upb/bindings/googlepb/proto2.cc index 87c13b6..636bb90 100644 --- a/upb/bindings/googlepb/proto2.cc +++ b/upb/bindings/googlepb/proto2.cc @@ -449,12 +449,13 @@ case goog::FieldDescriptor::cpptype: \ enum OneofType { ONEOF_TYPE_NONE, ONEOF_TYPE_STRING, - ONEOF_TYPE_MESSAGE, + ONEOF_TYPE_MESSAGE #ifdef UPB_GOOGLE3 + , ONEOF_TYPE_GLOBALSTRING, ONEOF_TYPE_CORD, ONEOF_TYPE_STRINGPIECE, - ONEOF_TYPE_LAZYFIELD, + ONEOF_TYPE_LAZYFIELD #endif }; |