diff options
author | Josh Haberman <jhaberman@gmail.com> | 2019-03-26 08:32:05 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2019-03-26 08:32:05 -0700 |
commit | 0abf6083b33b13bea895bf5d885c5ec58b2bd986 (patch) | |
tree | 0278856cbd0263bdddd2f0c68259d3ec2ea383d5 /upb/msgfactory.h | |
parent | 32e3f394b42cff2b94c5ef84cb31009ce33c864f (diff) | |
parent | a8a0bc73b981bd94509c180ad8cac36143c479ec (diff) |
Merge branch 'master' into apitweaks
Diffstat (limited to 'upb/msgfactory.h')
-rw-r--r-- | upb/msgfactory.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/upb/msgfactory.h b/upb/msgfactory.h index 8b12461..9b3b599 100644 --- a/upb/msgfactory.h +++ b/upb/msgfactory.h @@ -5,15 +5,14 @@ #ifndef UPB_MSGFACTORY_H_ #define UPB_MSGFACTORY_H_ -#ifdef __cplusplus -namespace upb { -class MessageFactory; -} -#endif +/** upb_msgfactory ************************************************************/ -UPB_DECLARE_TYPE(upb::MessageFactory, upb_msgfactory) +struct upb_msgfactory; +typedef struct upb_msgfactory upb_msgfactory; -/** upb_msgfactory ************************************************************/ +#ifdef __cplusplus +extern "C" { +#endif /* A upb_msgfactory contains a cache of upb_msglayout, upb_handlers, and * upb_visitorplan objects. These are the objects necessary to represent, @@ -42,5 +41,8 @@ const upb_symtab *upb_msgfactory_symtab(const upb_msgfactory *f); const upb_msglayout *upb_msgfactory_getlayout(upb_msgfactory *f, const upb_msgdef *m); +#ifdef __cplusplus +} /* extern "C" */ +#endif #endif /* UPB_MSGFACTORY_H_ */ |