diff options
author | Joshua Haberman <joshua@reverberate.org> | 2010-01-02 15:30:51 -0800 |
---|---|---|
committer | Joshua Haberman <joshua@reverberate.org> | 2010-01-02 15:30:51 -0800 |
commit | fa5710f1cad50ddd17605c73d4661acbf265a469 (patch) | |
tree | 807e25b1afc282e829cd28f4a778118138c4a5d6 /descriptor/descriptor.h | |
parent | ece08710a64e09baf4bdcb71752ce20ff1d4a757 (diff) |
upb_string* -> upb_strptr, to follow aliasing rules.
Diffstat (limited to 'descriptor/descriptor.h')
-rw-r--r-- | descriptor/descriptor.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/descriptor/descriptor.h b/descriptor/descriptor.h index a591bba..8db5bd3 100644 --- a/descriptor/descriptor.h +++ b/descriptor/descriptor.h @@ -98,7 +98,7 @@ struct google_protobuf_UninterpretedOption_NamePart { bool is_extension:1; /* = 2, required. */ } has; } set_flags; - upb_string* name_part; + upb_strptr name_part; bool is_extension; }; UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart) @@ -117,7 +117,7 @@ struct google_protobuf_DescriptorProto { bool options:1; /* = 7, optional. */ } has; } set_flags; - upb_string* name; + upb_strptr name; UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* field; UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* nested_type; UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto)* enum_type; @@ -137,7 +137,7 @@ struct google_protobuf_EnumDescriptorProto { bool options:1; /* = 3, optional. */ } has; } set_flags; - upb_string* name; + upb_strptr name; UPB_MSG_ARRAY(google_protobuf_EnumValueDescriptorProto)* value; google_protobuf_EnumOptions* options; }; @@ -157,11 +157,11 @@ struct google_protobuf_UninterpretedOption { } has; } set_flags; UPB_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)* name; - upb_string* identifier_value; + upb_strptr identifier_value; uint64_t positive_int_value; int64_t negative_int_value; double double_value; - upb_string* string_value; + upb_strptr string_value; }; UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption) @@ -180,9 +180,9 @@ struct google_protobuf_FileDescriptorProto { bool options:1; /* = 8, optional. */ } has; } set_flags; - upb_string* name; - upb_string* package; - struct upb_string_array* dependency; + upb_strptr name; + upb_strptr package; + upb_array* dependency; UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* message_type; UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto)* enum_type; UPB_MSG_ARRAY(google_protobuf_ServiceDescriptorProto)* service; @@ -202,9 +202,9 @@ struct google_protobuf_MethodDescriptorProto { bool options:1; /* = 4, optional. */ } has; } set_flags; - upb_string* name; - upb_string* input_type; - upb_string* output_type; + upb_strptr name; + upb_strptr input_type; + upb_strptr output_type; google_protobuf_MethodOptions* options; }; UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodDescriptorProto) @@ -231,7 +231,7 @@ struct google_protobuf_EnumValueDescriptorProto { bool options:1; /* = 3, optional. */ } has; } set_flags; - upb_string* name; + upb_strptr name; int32_t number; google_protobuf_EnumValueOptions* options; }; @@ -247,7 +247,7 @@ struct google_protobuf_ServiceDescriptorProto { bool options:1; /* = 3, optional. */ } has; } set_flags; - upb_string* name; + upb_strptr name; UPB_MSG_ARRAY(google_protobuf_MethodDescriptorProto)* method; google_protobuf_ServiceOptions* options; }; @@ -294,7 +294,7 @@ struct google_protobuf_FieldOptions { int32_t ctype; bool packed; bool deprecated; - upb_string* experimental_map_key; + upb_strptr experimental_map_key; UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option; }; UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldOptions) @@ -311,8 +311,8 @@ struct google_protobuf_FileOptions { bool uninterpreted_option:1; /* = 999, repeated. */ } has; } set_flags; - upb_string* java_package; - upb_string* java_outer_classname; + upb_strptr java_package; + upb_strptr java_outer_classname; int32_t optimize_for; bool java_multiple_files; UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option; @@ -360,13 +360,13 @@ struct google_protobuf_FieldDescriptorProto { bool options:1; /* = 8, optional. */ } has; } set_flags; - upb_string* name; - upb_string* extendee; + upb_strptr name; + upb_strptr extendee; int32_t number; int32_t label; int32_t type; - upb_string* type_name; - upb_string* default_value; + upb_strptr type_name; + upb_strptr default_value; google_protobuf_FieldOptions* options; }; UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldDescriptorProto) |