diff options
author | Josh Haberman <jhaberman@gmail.com> | 2013-12-20 17:40:40 -0800 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2013-12-20 17:40:40 -0800 |
commit | ce9bba3cb5409844f8f3d7dcc235a9ea30cad090 (patch) | |
tree | 6c4e0a7c023c790a278f3616c749280c8da205af /upb/table.int.h | |
parent | aa8db6ab5ea18848247b8c4ac4715cf344941e94 (diff) |
Sync from Google-internal development.
Diffstat (limited to 'upb/table.int.h')
-rw-r--r-- | upb/table.int.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/upb/table.int.h b/upb/table.int.h index 0ed37ba..109f76b 100644 --- a/upb/table.int.h +++ b/upb/table.int.h @@ -38,13 +38,14 @@ extern "C" { // clients calling table accessors are correctly typed without having to have // an explosion of accessors. typedef enum { - UPB_CTYPE_INT32 = 1, - UPB_CTYPE_INT64 = 2, - UPB_CTYPE_UINT32 = 3, - UPB_CTYPE_UINT64 = 4, - UPB_CTYPE_BOOL = 5, - UPB_CTYPE_CSTR = 6, - UPB_CTYPE_PTR = 7, + UPB_CTYPE_INT32 = 1, + UPB_CTYPE_INT64 = 2, + UPB_CTYPE_UINT32 = 3, + UPB_CTYPE_UINT64 = 4, + UPB_CTYPE_BOOL = 5, + UPB_CTYPE_CSTR = 6, + UPB_CTYPE_PTR = 7, + UPB_CTYPE_CONSTPTR = 8, } upb_ctype_t; typedef union { @@ -129,13 +130,14 @@ UPB_INLINE upb_value _upb_value_val(_upb_value val, upb_ctype_t ctype) { return val.val.membername; \ } -FUNCS(int32, int32, int32_t, UPB_CTYPE_INT32); -FUNCS(int64, int64, int64_t, UPB_CTYPE_INT64); -FUNCS(uint32, uint32, uint32_t, UPB_CTYPE_UINT32); -FUNCS(uint64, uint64, uint64_t, UPB_CTYPE_UINT64); -FUNCS(bool, _bool, bool, UPB_CTYPE_BOOL); -FUNCS(cstr, cstr, char*, UPB_CTYPE_CSTR); -FUNCS(ptr, ptr, void*, UPB_CTYPE_PTR); +FUNCS(int32, int32, int32_t, UPB_CTYPE_INT32); +FUNCS(int64, int64, int64_t, UPB_CTYPE_INT64); +FUNCS(uint32, uint32, uint32_t, UPB_CTYPE_UINT32); +FUNCS(uint64, uint64, uint64_t, UPB_CTYPE_UINT64); +FUNCS(bool, _bool, bool, UPB_CTYPE_BOOL); +FUNCS(cstr, cstr, char*, UPB_CTYPE_CSTR); +FUNCS(ptr, ptr, void*, UPB_CTYPE_PTR); +FUNCS(constptr, constptr, const void*, UPB_CTYPE_CONSTPTR); #undef FUNCS |