diff options
author | Josh Haberman <jhaberman@gmail.com> | 2016-11-29 19:54:12 +0000 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2016-11-29 19:54:12 +0000 |
commit | e977c0af03fa2aa366ca7ecffcf007f186357c60 (patch) | |
tree | cebb16f6b8b9686d7da1a892465c9b74e53674d2 /upb/msg.h | |
parent | 39c2414d686e92541cda94904e003d4f0d15ca08 (diff) |
Fixed more bugs surfaced by Travis.
Diffstat (limited to 'upb/msg.h')
-rw-r--r-- | upb/msg.h | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -32,8 +32,13 @@ #ifdef __cplusplus namespace upb { -class MessageLayout; +class Array; +class Map; +class MapIterator; class MessageFactory; +class MessageLayout; +class Visitor; +class VisitorPlan; } #endif @@ -110,6 +115,9 @@ typedef union { int64_t i64; uint32_t u32; uint64_t u64; + const upb_map* map; + const upb_msg* msg; + const upb_array* arr; const void* ptr; struct { const char *ptr; @@ -137,10 +145,10 @@ ACCESSORS(int32, i32, int32_t) ACCESSORS(int64, i64, int64_t) ACCESSORS(uint32, u32, uint32_t) ACCESSORS(uint64, u64, uint64_t) -ACCESSORS(map, ptr, const upb_map*) -ACCESSORS(msg, ptr, const upb_msg*) +ACCESSORS(map, map, const upb_map*) +ACCESSORS(msg, msg, const upb_msg*) ACCESSORS(ptr, ptr, const void*) -ACCESSORS(arr, ptr, const upb_array*) +ACCESSORS(arr, arr, const upb_array*) #undef ACCESSORS |