Auto-generate files after cl/740773590
diff --git a/objectivec/GPBAny.pbobjc.h b/objectivec/GPBAny.pbobjc.h index 3e81534..131efca 100644 --- a/objectivec/GPBAny.pbobjc.h +++ b/objectivec/GPBAny.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBAny.pbobjc.m b/objectivec/GPBAny.pbobjc.m index 490e3fd..23b181a 100644 --- a/objectivec/GPBAny.pbobjc.m +++ b/objectivec/GPBAny.pbobjc.m
@@ -7,10 +7,10 @@ #import "GPBWellKnownTypes.h" #import "GPBAny.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -72,7 +72,7 @@ .number = GPBAny_FieldNumber_TypeURL, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBAny__storage_, typeURL), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), + .flags = (GPBFieldFlags)(GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), .dataType = GPBDataTypeString, }, { @@ -81,14 +81,14 @@ .number = GPBAny_FieldNumber_Value, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBAny__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeBytes, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBAny) messageName:@"Any" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBAnyRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBApi.pbobjc.h b/objectivec/GPBApi.pbobjc.h index 75baf9d..4815920 100644 --- a/objectivec/GPBApi.pbobjc.h +++ b/objectivec/GPBApi.pbobjc.h
@@ -9,10 +9,10 @@ #import "GPBSourceContext.pbobjc.h" #import "GPBType.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBApi.pbobjc.m b/objectivec/GPBApi.pbobjc.m index 8c2e0a5..a906ac3 100644 --- a/objectivec/GPBApi.pbobjc.m +++ b/objectivec/GPBApi.pbobjc.m
@@ -6,10 +6,10 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #import "GPBApi.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -78,7 +78,7 @@ .number = GPBApi_FieldNumber_Name, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBApi__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -105,7 +105,7 @@ .number = GPBApi_FieldNumber_Version, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBApi__storage_, version), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -114,7 +114,7 @@ .number = GPBApi_FieldNumber_SourceContext, .hasIndex = 2, .offset = (uint32_t)offsetof(GPBApi__storage_, sourceContext), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeMessage, }, { @@ -132,14 +132,14 @@ .number = GPBApi_FieldNumber_Syntax, .hasIndex = 3, .offset = (uint32_t)offsetof(GPBApi__storage_, syntax), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeEnum, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBApi) messageName:@"Api" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBApiRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -200,7 +200,7 @@ .number = GPBMethod_FieldNumber_Name, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBMethod__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -209,7 +209,7 @@ .number = GPBMethod_FieldNumber_RequestTypeURL, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBMethod__storage_, requestTypeURL), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), + .flags = (GPBFieldFlags)(GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), .dataType = GPBDataTypeString, }, { @@ -218,7 +218,7 @@ .number = GPBMethod_FieldNumber_RequestStreaming, .hasIndex = 2, .offset = 3, // Stored in _has_storage_ to save space. - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeBool, }, { @@ -227,7 +227,7 @@ .number = GPBMethod_FieldNumber_ResponseTypeURL, .hasIndex = 4, .offset = (uint32_t)offsetof(GPBMethod__storage_, responseTypeURL), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), + .flags = (GPBFieldFlags)(GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), .dataType = GPBDataTypeString, }, { @@ -236,7 +236,7 @@ .number = GPBMethod_FieldNumber_ResponseStreaming, .hasIndex = 5, .offset = 6, // Stored in _has_storage_ to save space. - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeBool, }, { @@ -254,14 +254,14 @@ .number = GPBMethod_FieldNumber_Syntax, .hasIndex = 7, .offset = (uint32_t)offsetof(GPBMethod__storage_, syntax), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeEnum, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBMethod) messageName:@"Method" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBApiRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -319,7 +319,7 @@ .number = GPBMixin_FieldNumber_Name, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBMixin__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -328,14 +328,14 @@ .number = GPBMixin_FieldNumber_Root, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBMixin__storage_, root), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBMixin) messageName:@"Mixin" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBApiRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBDuration.pbobjc.h b/objectivec/GPBDuration.pbobjc.h index b57555a..e7bcce0 100644 --- a/objectivec/GPBDuration.pbobjc.h +++ b/objectivec/GPBDuration.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBDuration.pbobjc.m b/objectivec/GPBDuration.pbobjc.m index 4d519db..c88b235 100644 --- a/objectivec/GPBDuration.pbobjc.m +++ b/objectivec/GPBDuration.pbobjc.m
@@ -7,10 +7,10 @@ #import "GPBWellKnownTypes.h" #import "GPBDuration.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -72,7 +72,7 @@ .number = GPBDuration_FieldNumber_Seconds, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBDuration__storage_, seconds), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt64, }, { @@ -81,14 +81,14 @@ .number = GPBDuration_FieldNumber_Nanos, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBDuration__storage_, nanos), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt32, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBDuration) messageName:@"Duration" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBDurationRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBEmpty.pbobjc.h b/objectivec/GPBEmpty.pbobjc.h index 26c2f7a..ef225cb 100644 --- a/objectivec/GPBEmpty.pbobjc.h +++ b/objectivec/GPBEmpty.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBEmpty.pbobjc.m b/objectivec/GPBEmpty.pbobjc.m index 01a22ac..e4d4125 100644 --- a/objectivec/GPBEmpty.pbobjc.m +++ b/objectivec/GPBEmpty.pbobjc.m
@@ -6,10 +6,10 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #import "GPBEmpty.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -56,7 +56,7 @@ GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBEmpty) messageName:@"Empty" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBEmptyRoot_FileDescription fields:NULL fieldCount:0
diff --git a/objectivec/GPBFieldMask.pbobjc.h b/objectivec/GPBFieldMask.pbobjc.h index 4e47d2c..0477724 100644 --- a/objectivec/GPBFieldMask.pbobjc.h +++ b/objectivec/GPBFieldMask.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBFieldMask.pbobjc.m b/objectivec/GPBFieldMask.pbobjc.m index 9722b61..c847500 100644 --- a/objectivec/GPBFieldMask.pbobjc.m +++ b/objectivec/GPBFieldMask.pbobjc.m
@@ -6,10 +6,10 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #import "GPBFieldMask.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -69,7 +69,7 @@ GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBFieldMask) messageName:@"FieldMask" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBFieldMaskRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBSourceContext.pbobjc.h b/objectivec/GPBSourceContext.pbobjc.h index 720e64c..0297c58 100644 --- a/objectivec/GPBSourceContext.pbobjc.h +++ b/objectivec/GPBSourceContext.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBSourceContext.pbobjc.m b/objectivec/GPBSourceContext.pbobjc.m index 86d65ca..9edff14 100644 --- a/objectivec/GPBSourceContext.pbobjc.m +++ b/objectivec/GPBSourceContext.pbobjc.m
@@ -6,10 +6,10 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #import "GPBSourceContext.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -62,14 +62,14 @@ .number = GPBSourceContext_FieldNumber_FileName, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBSourceContext__storage_, fileName), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBSourceContext) messageName:@"SourceContext" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBSourceContextRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBStruct.pbobjc.h b/objectivec/GPBStruct.pbobjc.h index d0d609e..2583967 100644 --- a/objectivec/GPBStruct.pbobjc.h +++ b/objectivec/GPBStruct.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m index 6805b87..299338a 100644 --- a/objectivec/GPBStruct.pbobjc.m +++ b/objectivec/GPBStruct.pbobjc.m
@@ -6,10 +6,10 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #import "GPBStruct.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -56,7 +56,7 @@ }; GPBEnumDescriptor *worker = [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBNullValue) - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 valueNames:valueNames values:values count:(uint32_t)(sizeof(values) / sizeof(int32_t)) @@ -109,7 +109,7 @@ GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBStruct) messageName:@"Struct" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBStructRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -158,7 +158,7 @@ .number = GPBValue_FieldNumber_NullValue, .hasIndex = -1, .offset = (uint32_t)offsetof(GPBValue__storage_, nullValue), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeEnum, }, { @@ -167,7 +167,7 @@ .number = GPBValue_FieldNumber_NumberValue, .hasIndex = -1, .offset = (uint32_t)offsetof(GPBValue__storage_, numberValue), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeDouble, }, { @@ -176,7 +176,7 @@ .number = GPBValue_FieldNumber_StringValue, .hasIndex = -1, .offset = (uint32_t)offsetof(GPBValue__storage_, stringValue), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeString, }, { @@ -185,7 +185,7 @@ .number = GPBValue_FieldNumber_BoolValue, .hasIndex = -1, .offset = 0, // Stored in _has_storage_ to save space. - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeBool, }, { @@ -194,7 +194,7 @@ .number = GPBValue_FieldNumber_StructValue, .hasIndex = -1, .offset = (uint32_t)offsetof(GPBValue__storage_, structValue), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeMessage, }, { @@ -203,14 +203,14 @@ .number = GPBValue_FieldNumber_ListValue, .hasIndex = -1, .offset = (uint32_t)offsetof(GPBValue__storage_, listValue), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeMessage, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBValue) messageName:@"Value" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBStructRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -279,7 +279,7 @@ GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBListValue) messageName:@"ListValue" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBStructRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBTimestamp.pbobjc.h b/objectivec/GPBTimestamp.pbobjc.h index 3173cd2..9794842 100644 --- a/objectivec/GPBTimestamp.pbobjc.h +++ b/objectivec/GPBTimestamp.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBTimestamp.pbobjc.m b/objectivec/GPBTimestamp.pbobjc.m index 71c5769..1ea2bc4 100644 --- a/objectivec/GPBTimestamp.pbobjc.m +++ b/objectivec/GPBTimestamp.pbobjc.m
@@ -7,10 +7,10 @@ #import "GPBWellKnownTypes.h" #import "GPBTimestamp.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -72,7 +72,7 @@ .number = GPBTimestamp_FieldNumber_Seconds, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBTimestamp__storage_, seconds), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt64, }, { @@ -81,14 +81,14 @@ .number = GPBTimestamp_FieldNumber_Nanos, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBTimestamp__storage_, nanos), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt32, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBTimestamp) messageName:@"Timestamp" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBTimestampRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBType.pbobjc.h b/objectivec/GPBType.pbobjc.h index 96660d5..4c4dcf0 100644 --- a/objectivec/GPBType.pbobjc.h +++ b/objectivec/GPBType.pbobjc.h
@@ -9,10 +9,10 @@ #import "GPBAny.pbobjc.h" #import "GPBSourceContext.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBType.pbobjc.m b/objectivec/GPBType.pbobjc.m index 7afc370..20b3c8a 100644 --- a/objectivec/GPBType.pbobjc.m +++ b/objectivec/GPBType.pbobjc.m
@@ -6,10 +6,10 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #import "GPBType.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -62,7 +62,7 @@ }; GPBEnumDescriptor *worker = [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBSyntax) - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 valueNames:valueNames values:values count:(uint32_t)(sizeof(values) / sizeof(int32_t)) @@ -122,7 +122,7 @@ }; GPBEnumDescriptor *worker = [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBField_Kind) - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 valueNames:valueNames values:values count:(uint32_t)(sizeof(values) / sizeof(int32_t)) @@ -179,7 +179,7 @@ }; GPBEnumDescriptor *worker = [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBField_Cardinality) - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 valueNames:valueNames values:values count:(uint32_t)(sizeof(values) / sizeof(int32_t)) @@ -240,7 +240,7 @@ .number = GPBType_FieldNumber_Name, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBType__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -276,7 +276,7 @@ .number = GPBType_FieldNumber_SourceContext, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBType__storage_, sourceContext), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeMessage, }, { @@ -285,7 +285,7 @@ .number = GPBType_FieldNumber_Syntax, .hasIndex = 2, .offset = (uint32_t)offsetof(GPBType__storage_, syntax), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeEnum, }, { @@ -294,14 +294,14 @@ .number = GPBType_FieldNumber_Edition, .hasIndex = 3, .offset = (uint32_t)offsetof(GPBType__storage_, edition), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBType) messageName:@"Type" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBTypeRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -369,7 +369,7 @@ .number = GPBField_FieldNumber_Kind, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBField__storage_, kind), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeEnum, }, { @@ -378,7 +378,7 @@ .number = GPBField_FieldNumber_Cardinality, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBField__storage_, cardinality), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeEnum, }, { @@ -387,7 +387,7 @@ .number = GPBField_FieldNumber_Number, .hasIndex = 2, .offset = (uint32_t)offsetof(GPBField__storage_, number), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt32, }, { @@ -396,7 +396,7 @@ .number = GPBField_FieldNumber_Name, .hasIndex = 3, .offset = (uint32_t)offsetof(GPBField__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -405,7 +405,7 @@ .number = GPBField_FieldNumber_TypeURL, .hasIndex = 4, .offset = (uint32_t)offsetof(GPBField__storage_, typeURL), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), + .flags = (GPBFieldFlags)(GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero), .dataType = GPBDataTypeString, }, { @@ -414,7 +414,7 @@ .number = GPBField_FieldNumber_OneofIndex, .hasIndex = 5, .offset = (uint32_t)offsetof(GPBField__storage_, oneofIndex), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt32, }, { @@ -423,7 +423,7 @@ .number = GPBField_FieldNumber_Packed, .hasIndex = 6, .offset = 7, // Stored in _has_storage_ to save space. - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeBool, }, { @@ -441,7 +441,7 @@ .number = GPBField_FieldNumber_JsonName, .hasIndex = 8, .offset = (uint32_t)offsetof(GPBField__storage_, jsonName), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -450,14 +450,14 @@ .number = GPBField_FieldNumber_DefaultValue, .hasIndex = 9, .offset = (uint32_t)offsetof(GPBField__storage_, defaultValue), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBField) messageName:@"Field" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBTypeRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -535,7 +535,7 @@ .number = GPBEnum_FieldNumber_Name, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBEnum__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -562,7 +562,7 @@ .number = GPBEnum_FieldNumber_SourceContext, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBEnum__storage_, sourceContext), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeMessage, }, { @@ -571,7 +571,7 @@ .number = GPBEnum_FieldNumber_Syntax, .hasIndex = 2, .offset = (uint32_t)offsetof(GPBEnum__storage_, syntax), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeEnum, }, { @@ -580,14 +580,14 @@ .number = GPBEnum_FieldNumber_Edition, .hasIndex = 3, .offset = (uint32_t)offsetof(GPBEnum__storage_, edition), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBEnum) messageName:@"Enum" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBTypeRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -642,7 +642,7 @@ .number = GPBEnumValue_FieldNumber_Name, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBEnumValue__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -651,7 +651,7 @@ .number = GPBEnumValue_FieldNumber_Number, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBEnumValue__storage_, number), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt32, }, { @@ -667,7 +667,7 @@ GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBEnumValue) messageName:@"EnumValue" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBTypeRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -708,7 +708,7 @@ .number = GPBOption_FieldNumber_Name, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBOption__storage_, name), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, { @@ -717,14 +717,14 @@ .number = GPBOption_FieldNumber_Value, .hasIndex = 1, .offset = (uint32_t)offsetof(GPBOption__storage_, value), - .flags = GPBFieldOptional, + .flags = GPBFieldNone, .dataType = GPBDataTypeMessage, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBOption) messageName:@"Option" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBTypeRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
diff --git a/objectivec/GPBWrappers.pbobjc.h b/objectivec/GPBWrappers.pbobjc.h index 3c35631..72c79ac 100644 --- a/objectivec/GPBWrappers.pbobjc.h +++ b/objectivec/GPBWrappers.pbobjc.h
@@ -7,10 +7,10 @@ #import "GPBMessage.h" #import "GPBRootObject.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif
diff --git a/objectivec/GPBWrappers.pbobjc.m b/objectivec/GPBWrappers.pbobjc.m index 2cc105f..f902cf0 100644 --- a/objectivec/GPBWrappers.pbobjc.m +++ b/objectivec/GPBWrappers.pbobjc.m
@@ -6,10 +6,10 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #import "GPBWrappers.pbobjc.h" -#if GOOGLE_PROTOBUF_OBJC_VERSION < 40310 +#if GOOGLE_PROTOBUF_OBJC_VERSION < 40311 #error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources. #endif -#if 40310 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION +#if 40311 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION #error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources. #endif @@ -70,14 +70,14 @@ .number = GPBDoubleValue_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBDoubleValue__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeDouble, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBDoubleValue) messageName:@"DoubleValue" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -116,14 +116,14 @@ .number = GPBFloatValue_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBFloatValue__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeFloat, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBFloatValue) messageName:@"FloatValue" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -162,14 +162,14 @@ .number = GPBInt64Value_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBInt64Value__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt64, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBInt64Value) messageName:@"Int64Value" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -208,14 +208,14 @@ .number = GPBUInt64Value_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBUInt64Value__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeUInt64, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBUInt64Value) messageName:@"UInt64Value" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -254,14 +254,14 @@ .number = GPBInt32Value_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBInt32Value__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeInt32, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBInt32Value) messageName:@"Int32Value" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -300,14 +300,14 @@ .number = GPBUInt32Value_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBUInt32Value__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeUInt32, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBUInt32Value) messageName:@"UInt32Value" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -345,14 +345,14 @@ .number = GPBBoolValue_FieldNumber_Value, .hasIndex = 0, .offset = 1, // Stored in _has_storage_ to save space. - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeBool, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBBoolValue) messageName:@"BoolValue" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -391,14 +391,14 @@ .number = GPBStringValue_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBStringValue__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeString, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBStringValue) messageName:@"StringValue" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) @@ -437,14 +437,14 @@ .number = GPBBytesValue_FieldNumber_Value, .hasIndex = 0, .offset = (uint32_t)offsetof(GPBBytesValue__storage_, value), - .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero), + .flags = GPBFieldClearHasIvarOnZero, .dataType = GPBDataTypeBytes, }, }; GPBDescriptor *localDescriptor = [GPBDescriptor allocDescriptorForClass:GPBObjCClass(GPBBytesValue) messageName:@"BytesValue" - runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310 + runtimeSupport:&GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40311 fileDescription:&GPBWrappersRoot_FileDescription fields:fields fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))