diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2015-06-03 14:35:27 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2015-06-03 14:35:27 -0700 |
| commit | 97eeb570225bb2f1060f4eff18ba664e129767d2 (patch) | |
| tree | 6a2d282c3c7910263241e03f41be23c6a6cda710 /upb/bindings/googlepb | |
| parent | 6650b3c6527c17965adf7239850857a10d56ba62 (diff) | |
| parent | 919fea438a5ac5366684cfa26d2bb3d17519cb60 (diff) | |
Merge pull request #27 from haberman/c89
Ported upb to C89, for greater portability.
Diffstat (limited to 'upb/bindings/googlepb')
| -rw-r--r-- | upb/bindings/googlepb/proto2.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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 }; |