diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 13:54:05 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 13:54:05 -0700 |
| commit | 8d8177c75701014dfe27fec4cdd2b1647aefcb67 (patch) | |
| tree | fdc5d0d0f2fd57f2ca641069c20b34ddf90ec919 /objectivec/google/protobuf/Descriptor.pbobjc.m | |
| parent | 46e8ff63cb67a6520711da5317aaaef04d0414d0 (diff) | |
| parent | cccf6fed7e2fad1240bb48ba0c47f3978ff7433d (diff) | |
| download | protobuf-8d8177c75701014dfe27fec4cdd2b1647aefcb67.tar.gz protobuf-8d8177c75701014dfe27fec4cdd2b1647aefcb67.tar.bz2 protobuf-8d8177c75701014dfe27fec4cdd2b1647aefcb67.zip | |
Merge remote-tracking branch 'origin/master' into fix-author
Diffstat (limited to 'objectivec/google/protobuf/Descriptor.pbobjc.m')
| -rw-r--r-- | objectivec/google/protobuf/Descriptor.pbobjc.m | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/objectivec/google/protobuf/Descriptor.pbobjc.m b/objectivec/google/protobuf/Descriptor.pbobjc.m index 8d69867b..e3e44c48 100644 --- a/objectivec/google/protobuf/Descriptor.pbobjc.m +++ b/objectivec/google/protobuf/Descriptor.pbobjc.m @@ -578,6 +578,7 @@ typedef struct GPBDescriptorProto_ReservedRange__storage_ { @dynamic hasExtendee, extendee; @dynamic hasDefaultValue, defaultValue; @dynamic hasOneofIndex, oneofIndex; +@dynamic hasJsonName, jsonName; @dynamic hasOptions, options; typedef struct GPBFieldDescriptorProto__storage_ { @@ -591,6 +592,7 @@ typedef struct GPBFieldDescriptorProto__storage_ { NSString *typeName; NSString *defaultValue; GPBFieldOptions *options; + NSString *jsonName; } GPBFieldDescriptorProto__storage_; // This method is threadsafe because it is initially called @@ -679,7 +681,7 @@ typedef struct GPBFieldDescriptorProto__storage_ { { .name = "options", .number = GPBFieldDescriptorProto_FieldNumber_Options, - .hasIndex = 8, + .hasIndex = 9, .flags = GPBFieldOptional, .dataType = GPBDataTypeMessage, .offset = offsetof(GPBFieldDescriptorProto__storage_, options), @@ -698,6 +700,17 @@ typedef struct GPBFieldDescriptorProto__storage_ { .dataTypeSpecific.className = NULL, .fieldOptions = NULL, }, + { + .name = "jsonName", + .number = GPBFieldDescriptorProto_FieldNumber_JsonName, + .hasIndex = 8, + .flags = GPBFieldOptional, + .dataType = GPBDataTypeString, + .offset = offsetof(GPBFieldDescriptorProto__storage_, jsonName), + .defaultValue.valueString = nil, + .dataTypeSpecific.className = NULL, + .fieldOptions = NULL, + }, }; static GPBMessageEnumDescription enums[] = { { .enumDescriptorFunc = GPBFieldDescriptorProto_Type_EnumDescriptor }, |