diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-03-28 21:58:46 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-03-28 21:58:46 -0700 |
commit | d0b9d0a9b782e46a483d4d72515f9ab4f72e402a (patch) | |
tree | 783d68c8df77a2a628f1517c0576f20df634dec3 /upb/structdefs.int.h | |
parent | f73baf670e8b14ef15fedfaa593ba71ba94dcfc8 (diff) | |
parent | 7f0d3bb83dbb7590f3008182a8b27ecf9f0220d3 (diff) |
Merge pull request #52 from haberman/oneof-not-def
Make OneofDef stop deriving from Def.
Diffstat (limited to 'upb/structdefs.int.h')
-rw-r--r-- | upb/structdefs.int.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/upb/structdefs.int.h b/upb/structdefs.int.h index b7b36fa..467963b 100644 --- a/upb/structdefs.int.h +++ b/upb/structdefs.int.h @@ -150,15 +150,16 @@ struct upb_enumdef { /* upb_oneofdef ***************************************************************/ struct upb_oneofdef { - upb_def base; + upb_refcounted base; + const char *name; upb_strtable ntof; upb_inttable itof; const upb_msgdef *parent; }; #define UPB_ONEOFDEF_INIT(name, ntof, itof, refs, ref2s) \ - { UPB_DEF_INIT(name, UPB_DEF_ENUM, refs, ref2s), ntof, itof } + { UPB_REFCOUNT_INIT(refs, ref2s), name, ntof, itof } /* upb_symtab *****************************************************************/ |