Merge pull request #2429 from thomasvl/issue1833_swift_prefix
Add a swift_prefix file option.
This commit is contained in:
Thomas Van Lenten
GitHub
commit
851cb81ddd
4 changed files with 424 additions and 198 deletions
|
|
@ -80,7 +80,7 @@ namespace Google.Protobuf.Reflection {
|
|||
"ASgJEhMKC291dHB1dF90eXBlGAMgASgJEi8KB29wdGlvbnMYBCABKAsyHi5n",
|
||||
"b29nbGUucHJvdG9idWYuTWV0aG9kT3B0aW9ucxIfChBjbGllbnRfc3RyZWFt",
|
||||
"aW5nGAUgASgIOgVmYWxzZRIfChBzZXJ2ZXJfc3RyZWFtaW5nGAYgASgIOgVm",
|
||||
"YWxzZSKEBQoLRmlsZU9wdGlvbnMSFAoMamF2YV9wYWNrYWdlGAEgASgJEhwK",
|
||||
"YWxzZSKaBQoLRmlsZU9wdGlvbnMSFAoMamF2YV9wYWNrYWdlGAEgASgJEhwK",
|
||||
"FGphdmFfb3V0ZXJfY2xhc3NuYW1lGAggASgJEiIKE2phdmFfbXVsdGlwbGVf",
|
||||
"ZmlsZXMYCiABKAg6BWZhbHNlEikKHWphdmFfZ2VuZXJhdGVfZXF1YWxzX2Fu",
|
||||
"ZF9oYXNoGBQgASgIQgIYARIlChZqYXZhX3N0cmluZ19jaGVja191dGY4GBsg",
|
||||
|
|
@ -91,59 +91,60 @@ namespace Google.Protobuf.Reflection {
|
|||
"cHlfZ2VuZXJpY19zZXJ2aWNlcxgSIAEoCDoFZmFsc2USGQoKZGVwcmVjYXRl",
|
||||
"ZBgXIAEoCDoFZmFsc2USHwoQY2NfZW5hYmxlX2FyZW5hcxgfIAEoCDoFZmFs",
|
||||
"c2USGQoRb2JqY19jbGFzc19wcmVmaXgYJCABKAkSGAoQY3NoYXJwX25hbWVz",
|
||||
"cGFjZRglIAEoCRJDChR1bmludGVycHJldGVkX29wdGlvbhjnByADKAsyJC5n",
|
||||
"b29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRlZE9wdGlvbiI6CgxPcHRpbWl6",
|
||||
"ZU1vZGUSCQoFU1BFRUQQARINCglDT0RFX1NJWkUQAhIQCgxMSVRFX1JVTlRJ",
|
||||
"TUUQAyoJCOgHEICAgIACSgQIJhAnIuwBCg5NZXNzYWdlT3B0aW9ucxImChdt",
|
||||
"ZXNzYWdlX3NldF93aXJlX2Zvcm1hdBgBIAEoCDoFZmFsc2USLgofbm9fc3Rh",
|
||||
"bmRhcmRfZGVzY3JpcHRvcl9hY2Nlc3NvchgCIAEoCDoFZmFsc2USGQoKZGVw",
|
||||
"cmVjYXRlZBgDIAEoCDoFZmFsc2USEQoJbWFwX2VudHJ5GAcgASgIEkMKFHVu",
|
||||
"aW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdvb2dsZS5wcm90b2J1Zi5V",
|
||||
"bmludGVycHJldGVkT3B0aW9uKgkI6AcQgICAgAJKBAgIEAkingMKDEZpZWxk",
|
||||
"T3B0aW9ucxI6CgVjdHlwZRgBIAEoDjIjLmdvb2dsZS5wcm90b2J1Zi5GaWVs",
|
||||
"ZE9wdGlvbnMuQ1R5cGU6BlNUUklORxIOCgZwYWNrZWQYAiABKAgSPwoGanN0",
|
||||
"eXBlGAYgASgOMiQuZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9ucy5KU1R5",
|
||||
"cGU6CUpTX05PUk1BTBITCgRsYXp5GAUgASgIOgVmYWxzZRIZCgpkZXByZWNh",
|
||||
"dGVkGAMgASgIOgVmYWxzZRITCgR3ZWFrGAogASgIOgVmYWxzZRJDChR1bmlu",
|
||||
"dGVycHJldGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5p",
|
||||
"bnRlcnByZXRlZE9wdGlvbiIvCgVDVHlwZRIKCgZTVFJJTkcQABIICgRDT1JE",
|
||||
"EAESEAoMU1RSSU5HX1BJRUNFEAIiNQoGSlNUeXBlEg0KCUpTX05PUk1BTBAA",
|
||||
"Eg0KCUpTX1NUUklORxABEg0KCUpTX05VTUJFUhACKgkI6AcQgICAgAJKBAgE",
|
||||
"EAUiXgoMT25lb2ZPcHRpb25zEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcH",
|
||||
"IAMoCzIkLmdvb2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uKgkI",
|
||||
"6AcQgICAgAIijQEKC0VudW1PcHRpb25zEhMKC2FsbG93X2FsaWFzGAIgASgI",
|
||||
"EhkKCmRlcHJlY2F0ZWQYAyABKAg6BWZhbHNlEkMKFHVuaW50ZXJwcmV0ZWRf",
|
||||
"b3B0aW9uGOcHIAMoCzIkLmdvb2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVk",
|
||||
"T3B0aW9uKgkI6AcQgICAgAIifQoQRW51bVZhbHVlT3B0aW9ucxIZCgpkZXBy",
|
||||
"ZWNhdGVkGAEgASgIOgVmYWxzZRJDChR1bmludGVycHJldGVkX29wdGlvbhjn",
|
||||
"ByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRlZE9wdGlvbioJ",
|
||||
"COgHEICAgIACInsKDlNlcnZpY2VPcHRpb25zEhkKCmRlcHJlY2F0ZWQYISAB",
|
||||
"KAg6BWZhbHNlEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdv",
|
||||
"b2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uKgkI6AcQgICAgAIi",
|
||||
"rQIKDU1ldGhvZE9wdGlvbnMSGQoKZGVwcmVjYXRlZBghIAEoCDoFZmFsc2US",
|
||||
"XwoRaWRlbXBvdGVuY3lfbGV2ZWwYIiABKA4yLy5nb29nbGUucHJvdG9idWYu",
|
||||
"TWV0aG9kT3B0aW9ucy5JZGVtcG90ZW5jeUxldmVsOhNJREVNUE9URU5DWV9V",
|
||||
"TktOT1dOEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdvb2ds",
|
||||
"ZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uIlAKEElkZW1wb3RlbmN5",
|
||||
"TGV2ZWwSFwoTSURFTVBPVEVOQ1lfVU5LTk9XThAAEhMKD05PX1NJREVfRUZG",
|
||||
"RUNUUxABEg4KCklERU1QT1RFTlQQAioJCOgHEICAgIACIp4CChNVbmludGVy",
|
||||
"cHJldGVkT3B0aW9uEjsKBG5hbWUYAiADKAsyLS5nb29nbGUucHJvdG9idWYu",
|
||||
"VW5pbnRlcnByZXRlZE9wdGlvbi5OYW1lUGFydBIYChBpZGVudGlmaWVyX3Zh",
|
||||
"bHVlGAMgASgJEhoKEnBvc2l0aXZlX2ludF92YWx1ZRgEIAEoBBIaChJuZWdh",
|
||||
"dGl2ZV9pbnRfdmFsdWUYBSABKAMSFAoMZG91YmxlX3ZhbHVlGAYgASgBEhQK",
|
||||
"DHN0cmluZ192YWx1ZRgHIAEoDBIXCg9hZ2dyZWdhdGVfdmFsdWUYCCABKAka",
|
||||
"MwoITmFtZVBhcnQSEQoJbmFtZV9wYXJ0GAEgAigJEhQKDGlzX2V4dGVuc2lv",
|
||||
"bhgCIAIoCCLVAQoOU291cmNlQ29kZUluZm8SOgoIbG9jYXRpb24YASADKAsy",
|
||||
"KC5nb29nbGUucHJvdG9idWYuU291cmNlQ29kZUluZm8uTG9jYXRpb24ahgEK",
|
||||
"CExvY2F0aW9uEhAKBHBhdGgYASADKAVCAhABEhAKBHNwYW4YAiADKAVCAhAB",
|
||||
"EhgKEGxlYWRpbmdfY29tbWVudHMYAyABKAkSGQoRdHJhaWxpbmdfY29tbWVu",
|
||||
"dHMYBCABKAkSIQoZbGVhZGluZ19kZXRhY2hlZF9jb21tZW50cxgGIAMoCSKn",
|
||||
"AQoRR2VuZXJhdGVkQ29kZUluZm8SQQoKYW5ub3RhdGlvbhgBIAMoCzItLmdv",
|
||||
"b2dsZS5wcm90b2J1Zi5HZW5lcmF0ZWRDb2RlSW5mby5Bbm5vdGF0aW9uGk8K",
|
||||
"CkFubm90YXRpb24SEAoEcGF0aBgBIAMoBUICEAESEwoLc291cmNlX2ZpbGUY",
|
||||
"AiABKAkSDQoFYmVnaW4YAyABKAUSCwoDZW5kGAQgASgFQlgKE2NvbS5nb29n",
|
||||
"bGUucHJvdG9idWZCEERlc2NyaXB0b3JQcm90b3NIAVoKZGVzY3JpcHRvcqIC",
|
||||
"A0dQQqoCGkdvb2dsZS5Qcm90b2J1Zi5SZWZsZWN0aW9u"));
|
||||
"cGFjZRglIAEoCRIUCgxzd2lmdF9wcmVmaXgYJyABKAkSQwoUdW5pbnRlcnBy",
|
||||
"ZXRlZF9vcHRpb24Y5wcgAygLMiQuZ29vZ2xlLnByb3RvYnVmLlVuaW50ZXJw",
|
||||
"cmV0ZWRPcHRpb24iOgoMT3B0aW1pemVNb2RlEgkKBVNQRUVEEAESDQoJQ09E",
|
||||
"RV9TSVpFEAISEAoMTElURV9SVU5USU1FEAMqCQjoBxCAgICAAkoECCYQJyLs",
|
||||
"AQoOTWVzc2FnZU9wdGlvbnMSJgoXbWVzc2FnZV9zZXRfd2lyZV9mb3JtYXQY",
|
||||
"ASABKAg6BWZhbHNlEi4KH25vX3N0YW5kYXJkX2Rlc2NyaXB0b3JfYWNjZXNz",
|
||||
"b3IYAiABKAg6BWZhbHNlEhkKCmRlcHJlY2F0ZWQYAyABKAg6BWZhbHNlEhEK",
|
||||
"CW1hcF9lbnRyeRgHIAEoCBJDChR1bmludGVycHJldGVkX29wdGlvbhjnByAD",
|
||||
"KAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRlZE9wdGlvbioJCOgH",
|
||||
"EICAgIACSgQICBAJIp4DCgxGaWVsZE9wdGlvbnMSOgoFY3R5cGUYASABKA4y",
|
||||
"Iy5nb29nbGUucHJvdG9idWYuRmllbGRPcHRpb25zLkNUeXBlOgZTVFJJTkcS",
|
||||
"DgoGcGFja2VkGAIgASgIEj8KBmpzdHlwZRgGIAEoDjIkLmdvb2dsZS5wcm90",
|
||||
"b2J1Zi5GaWVsZE9wdGlvbnMuSlNUeXBlOglKU19OT1JNQUwSEwoEbGF6eRgF",
|
||||
"IAEoCDoFZmFsc2USGQoKZGVwcmVjYXRlZBgDIAEoCDoFZmFsc2USEwoEd2Vh",
|
||||
"axgKIAEoCDoFZmFsc2USQwoUdW5pbnRlcnByZXRlZF9vcHRpb24Y5wcgAygL",
|
||||
"MiQuZ29vZ2xlLnByb3RvYnVmLlVuaW50ZXJwcmV0ZWRPcHRpb24iLwoFQ1R5",
|
||||
"cGUSCgoGU1RSSU5HEAASCAoEQ09SRBABEhAKDFNUUklOR19QSUVDRRACIjUK",
|
||||
"BkpTVHlwZRINCglKU19OT1JNQUwQABINCglKU19TVFJJTkcQARINCglKU19O",
|
||||
"VU1CRVIQAioJCOgHEICAgIACSgQIBBAFIl4KDE9uZW9mT3B0aW9ucxJDChR1",
|
||||
"bmludGVycHJldGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYu",
|
||||
"VW5pbnRlcnByZXRlZE9wdGlvbioJCOgHEICAgIACIo0BCgtFbnVtT3B0aW9u",
|
||||
"cxITCgthbGxvd19hbGlhcxgCIAEoCBIZCgpkZXByZWNhdGVkGAMgASgIOgVm",
|
||||
"YWxzZRJDChR1bmludGVycHJldGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUu",
|
||||
"cHJvdG9idWYuVW5pbnRlcnByZXRlZE9wdGlvbioJCOgHEICAgIACIn0KEEVu",
|
||||
"dW1WYWx1ZU9wdGlvbnMSGQoKZGVwcmVjYXRlZBgBIAEoCDoFZmFsc2USQwoU",
|
||||
"dW5pbnRlcnByZXRlZF9vcHRpb24Y5wcgAygLMiQuZ29vZ2xlLnByb3RvYnVm",
|
||||
"LlVuaW50ZXJwcmV0ZWRPcHRpb24qCQjoBxCAgICAAiJ7Cg5TZXJ2aWNlT3B0",
|
||||
"aW9ucxIZCgpkZXByZWNhdGVkGCEgASgIOgVmYWxzZRJDChR1bmludGVycHJl",
|
||||
"dGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnBy",
|
||||
"ZXRlZE9wdGlvbioJCOgHEICAgIACIq0CCg1NZXRob2RPcHRpb25zEhkKCmRl",
|
||||
"cHJlY2F0ZWQYISABKAg6BWZhbHNlEl8KEWlkZW1wb3RlbmN5X2xldmVsGCIg",
|
||||
"ASgOMi8uZ29vZ2xlLnByb3RvYnVmLk1ldGhvZE9wdGlvbnMuSWRlbXBvdGVu",
|
||||
"Y3lMZXZlbDoTSURFTVBPVEVOQ1lfVU5LTk9XThJDChR1bmludGVycHJldGVk",
|
||||
"X29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRl",
|
||||
"ZE9wdGlvbiJQChBJZGVtcG90ZW5jeUxldmVsEhcKE0lERU1QT1RFTkNZX1VO",
|
||||
"S05PV04QABITCg9OT19TSURFX0VGRkVDVFMQARIOCgpJREVNUE9URU5UEAIq",
|
||||
"CQjoBxCAgICAAiKeAgoTVW5pbnRlcnByZXRlZE9wdGlvbhI7CgRuYW1lGAIg",
|
||||
"AygLMi0uZ29vZ2xlLnByb3RvYnVmLlVuaW50ZXJwcmV0ZWRPcHRpb24uTmFt",
|
||||
"ZVBhcnQSGAoQaWRlbnRpZmllcl92YWx1ZRgDIAEoCRIaChJwb3NpdGl2ZV9p",
|
||||
"bnRfdmFsdWUYBCABKAQSGgoSbmVnYXRpdmVfaW50X3ZhbHVlGAUgASgDEhQK",
|
||||
"DGRvdWJsZV92YWx1ZRgGIAEoARIUCgxzdHJpbmdfdmFsdWUYByABKAwSFwoP",
|
||||
"YWdncmVnYXRlX3ZhbHVlGAggASgJGjMKCE5hbWVQYXJ0EhEKCW5hbWVfcGFy",
|
||||
"dBgBIAIoCRIUCgxpc19leHRlbnNpb24YAiACKAgi1QEKDlNvdXJjZUNvZGVJ",
|
||||
"bmZvEjoKCGxvY2F0aW9uGAEgAygLMiguZ29vZ2xlLnByb3RvYnVmLlNvdXJj",
|
||||
"ZUNvZGVJbmZvLkxvY2F0aW9uGoYBCghMb2NhdGlvbhIQCgRwYXRoGAEgAygF",
|
||||
"QgIQARIQCgRzcGFuGAIgAygFQgIQARIYChBsZWFkaW5nX2NvbW1lbnRzGAMg",
|
||||
"ASgJEhkKEXRyYWlsaW5nX2NvbW1lbnRzGAQgASgJEiEKGWxlYWRpbmdfZGV0",
|
||||
"YWNoZWRfY29tbWVudHMYBiADKAkipwEKEUdlbmVyYXRlZENvZGVJbmZvEkEK",
|
||||
"CmFubm90YXRpb24YASADKAsyLS5nb29nbGUucHJvdG9idWYuR2VuZXJhdGVk",
|
||||
"Q29kZUluZm8uQW5ub3RhdGlvbhpPCgpBbm5vdGF0aW9uEhAKBHBhdGgYASAD",
|
||||
"KAVCAhABEhMKC3NvdXJjZV9maWxlGAIgASgJEg0KBWJlZ2luGAMgASgFEgsK",
|
||||
"A2VuZBgEIAEoBUJYChNjb20uZ29vZ2xlLnByb3RvYnVmQhBEZXNjcmlwdG9y",
|
||||
"UHJvdG9zSAFaCmRlc2NyaXB0b3KiAgNHUEKqAhpHb29nbGUuUHJvdG9idWYu",
|
||||
"UmVmbGVjdGlvbg=="));
|
||||
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
||||
new pbr::FileDescriptor[] { },
|
||||
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
|
||||
|
|
@ -157,7 +158,7 @@ namespace Google.Protobuf.Reflection {
|
|||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumValueDescriptorProto), global::Google.Protobuf.Reflection.EnumValueDescriptorProto.Parser, new[]{ "Name", "Number", "Options" }, null, null, null),
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.ServiceDescriptorProto), global::Google.Protobuf.Reflection.ServiceDescriptorProto.Parser, new[]{ "Name", "Method", "Options" }, null, null, null),
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MethodDescriptorProto), global::Google.Protobuf.Reflection.MethodDescriptorProto.Parser, new[]{ "Name", "InputType", "OutputType", "Options", "ClientStreaming", "ServerStreaming" }, null, null, null),
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileOptions), global::Google.Protobuf.Reflection.FileOptions.Parser, new[]{ "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode) }, null),
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileOptions), global::Google.Protobuf.Reflection.FileOptions.Parser, new[]{ "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "SwiftPrefix", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode) }, null),
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MessageOptions), global::Google.Protobuf.Reflection.MessageOptions.Parser, new[]{ "MessageSetWireFormat", "NoStandardDescriptorAccessor", "Deprecated", "MapEntry", "UninterpretedOption" }, null, null, null),
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FieldOptions), global::Google.Protobuf.Reflection.FieldOptions.Parser, new[]{ "Ctype", "Packed", "Jstype", "Lazy", "Deprecated", "Weak", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.CType), typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.JSType) }, null),
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.OneofOptions), global::Google.Protobuf.Reflection.OneofOptions.Parser, new[]{ "UninterpretedOption" }, null, null, null),
|
||||
|
|
@ -2800,6 +2801,7 @@ namespace Google.Protobuf.Reflection {
|
|||
ccEnableArenas_ = other.ccEnableArenas_;
|
||||
objcClassPrefix_ = other.objcClassPrefix_;
|
||||
csharpNamespace_ = other.csharpNamespace_;
|
||||
swiftPrefix_ = other.swiftPrefix_;
|
||||
uninterpretedOption_ = other.uninterpretedOption_.Clone();
|
||||
}
|
||||
|
||||
|
|
@ -3031,6 +3033,23 @@ namespace Google.Protobuf.Reflection {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "swift_prefix" field.</summary>
|
||||
public const int SwiftPrefixFieldNumber = 39;
|
||||
private string swiftPrefix_ = "";
|
||||
/// <summary>
|
||||
/// By default Swift generators will take the proto package and CamelCase it
|
||||
/// replacing '.' with underscore and use that to prefix the types/symbols
|
||||
/// defined. When this options is provided, they will use this value instead
|
||||
/// to prefix the types/symbols defined.
|
||||
/// </summary>
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
public string SwiftPrefix {
|
||||
get { return swiftPrefix_; }
|
||||
set {
|
||||
swiftPrefix_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "uninterpreted_option" field.</summary>
|
||||
public const int UninterpretedOptionFieldNumber = 999;
|
||||
private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
|
||||
|
|
@ -3071,6 +3090,7 @@ namespace Google.Protobuf.Reflection {
|
|||
if (CcEnableArenas != other.CcEnableArenas) return false;
|
||||
if (ObjcClassPrefix != other.ObjcClassPrefix) return false;
|
||||
if (CsharpNamespace != other.CsharpNamespace) return false;
|
||||
if (SwiftPrefix != other.SwiftPrefix) return false;
|
||||
if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -3092,6 +3112,7 @@ namespace Google.Protobuf.Reflection {
|
|||
if (CcEnableArenas != false) hash ^= CcEnableArenas.GetHashCode();
|
||||
if (ObjcClassPrefix.Length != 0) hash ^= ObjcClassPrefix.GetHashCode();
|
||||
if (CsharpNamespace.Length != 0) hash ^= CsharpNamespace.GetHashCode();
|
||||
if (SwiftPrefix.Length != 0) hash ^= SwiftPrefix.GetHashCode();
|
||||
hash ^= uninterpretedOption_.GetHashCode();
|
||||
return hash;
|
||||
}
|
||||
|
|
@ -3159,6 +3180,10 @@ namespace Google.Protobuf.Reflection {
|
|||
output.WriteRawTag(170, 2);
|
||||
output.WriteString(CsharpNamespace);
|
||||
}
|
||||
if (SwiftPrefix.Length != 0) {
|
||||
output.WriteRawTag(186, 2);
|
||||
output.WriteString(SwiftPrefix);
|
||||
}
|
||||
uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
|
||||
}
|
||||
|
||||
|
|
@ -3207,6 +3232,9 @@ namespace Google.Protobuf.Reflection {
|
|||
if (CsharpNamespace.Length != 0) {
|
||||
size += 2 + pb::CodedOutputStream.ComputeStringSize(CsharpNamespace);
|
||||
}
|
||||
if (SwiftPrefix.Length != 0) {
|
||||
size += 2 + pb::CodedOutputStream.ComputeStringSize(SwiftPrefix);
|
||||
}
|
||||
size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
|
||||
return size;
|
||||
}
|
||||
|
|
@ -3258,6 +3286,9 @@ namespace Google.Protobuf.Reflection {
|
|||
if (other.CsharpNamespace.Length != 0) {
|
||||
CsharpNamespace = other.CsharpNamespace;
|
||||
}
|
||||
if (other.SwiftPrefix.Length != 0) {
|
||||
SwiftPrefix = other.SwiftPrefix;
|
||||
}
|
||||
uninterpretedOption_.Add(other.uninterpretedOption_);
|
||||
}
|
||||
|
||||
|
|
@ -3325,6 +3356,10 @@ namespace Google.Protobuf.Reflection {
|
|||
CsharpNamespace = input.ReadString();
|
||||
break;
|
||||
}
|
||||
case 314: {
|
||||
SwiftPrefix = input.ReadString();
|
||||
break;
|
||||
}
|
||||
case 7994: {
|
||||
uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -251,22 +251,24 @@ const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescripto
|
|||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, cc_enable_arenas_),
|
||||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, objc_class_prefix_),
|
||||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, csharp_namespace_),
|
||||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, swift_prefix_),
|
||||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, uninterpreted_option_),
|
||||
0,
|
||||
1,
|
||||
5,
|
||||
6,
|
||||
7,
|
||||
13,
|
||||
2,
|
||||
8,
|
||||
14,
|
||||
2,
|
||||
9,
|
||||
10,
|
||||
11,
|
||||
12,
|
||||
13,
|
||||
3,
|
||||
4,
|
||||
14,
|
||||
5,
|
||||
15,
|
||||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _has_bits_),
|
||||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _internal_metadata_),
|
||||
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _extensions_),
|
||||
|
|
@ -421,20 +423,20 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] = {
|
|||
{ 116, 123, sizeof(EnumValueDescriptorProto)},
|
||||
{ 126, 133, sizeof(ServiceDescriptorProto)},
|
||||
{ 136, 146, sizeof(MethodDescriptorProto)},
|
||||
{ 152, 171, sizeof(FileOptions)},
|
||||
{ 186, 195, sizeof(MessageOptions)},
|
||||
{ 200, 211, sizeof(FieldOptions)},
|
||||
{ 218, 223, sizeof(OneofOptions)},
|
||||
{ 224, 231, sizeof(EnumOptions)},
|
||||
{ 234, 240, sizeof(EnumValueOptions)},
|
||||
{ 242, 248, sizeof(ServiceOptions)},
|
||||
{ 250, 257, sizeof(MethodOptions)},
|
||||
{ 260, 266, sizeof(UninterpretedOption_NamePart)},
|
||||
{ 268, 279, sizeof(UninterpretedOption)},
|
||||
{ 286, 295, sizeof(SourceCodeInfo_Location)},
|
||||
{ 300, 305, sizeof(SourceCodeInfo)},
|
||||
{ 306, 314, sizeof(GeneratedCodeInfo_Annotation)},
|
||||
{ 318, 323, sizeof(GeneratedCodeInfo)},
|
||||
{ 152, 172, sizeof(FileOptions)},
|
||||
{ 188, 197, sizeof(MessageOptions)},
|
||||
{ 202, 213, sizeof(FieldOptions)},
|
||||
{ 220, 225, sizeof(OneofOptions)},
|
||||
{ 226, 233, sizeof(EnumOptions)},
|
||||
{ 236, 242, sizeof(EnumValueOptions)},
|
||||
{ 244, 250, sizeof(ServiceOptions)},
|
||||
{ 252, 259, sizeof(MethodOptions)},
|
||||
{ 262, 268, sizeof(UninterpretedOption_NamePart)},
|
||||
{ 270, 281, sizeof(UninterpretedOption)},
|
||||
{ 288, 297, sizeof(SourceCodeInfo_Location)},
|
||||
{ 302, 307, sizeof(SourceCodeInfo)},
|
||||
{ 308, 316, sizeof(GeneratedCodeInfo_Annotation)},
|
||||
{ 320, 325, sizeof(GeneratedCodeInfo)},
|
||||
};
|
||||
|
||||
static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = {
|
||||
|
|
@ -662,7 +664,7 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl() {
|
|||
"\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.g"
|
||||
"oogle.protobuf.MethodOptions\022\037\n\020client_s"
|
||||
"treaming\030\005 \001(\010:\005false\022\037\n\020server_streamin"
|
||||
"g\030\006 \001(\010:\005false\"\204\005\n\013FileOptions\022\024\n\014java_p"
|
||||
"g\030\006 \001(\010:\005false\"\232\005\n\013FileOptions\022\024\n\014java_p"
|
||||
"ackage\030\001 \001(\t\022\034\n\024java_outer_classname\030\010 \001"
|
||||
"(\t\022\"\n\023java_multiple_files\030\n \001(\010:\005false\022)"
|
||||
"\n\035java_generate_equals_and_hash\030\024 \001(\010B\002\030"
|
||||
|
|
@ -674,69 +676,70 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl() {
|
|||
"\005false\022\"\n\023py_generic_services\030\022 \001(\010:\005fal"
|
||||
"se\022\031\n\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enab"
|
||||
"le_arenas\030\037 \001(\010:\005false\022\031\n\021objc_class_pre"
|
||||
"fix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022C\n\024u"
|
||||
"fix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022\024\n\014s"
|
||||
"wift_prefix\030\' \001(\t\022C\n\024uninterpreted_optio"
|
||||
"n\030\347\007 \003(\0132$.google.protobuf.Uninterpreted"
|
||||
"Option\":\n\014OptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCOD"
|
||||
"E_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010"
|
||||
"&\020\'\"\354\001\n\016MessageOptions\022&\n\027message_set_wi"
|
||||
"re_format\030\001 \001(\010:\005false\022.\n\037no_standard_de"
|
||||
"scriptor_accessor\030\002 \001(\010:\005false\022\031\n\ndeprec"
|
||||
"ated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\022C\n\024"
|
||||
"uninterpreted_option\030\347\007 \003(\0132$.google.pro"
|
||||
"tobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\010"
|
||||
"\020\t\"\236\003\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.goo"
|
||||
"gle.protobuf.FieldOptions.CType:\006STRING\022"
|
||||
"\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$.google"
|
||||
".protobuf.FieldOptions.JSType:\tJS_NORMAL"
|
||||
"\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001("
|
||||
"\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024uninter"
|
||||
"preted_option\030\347\007 \003(\0132$.google.protobuf.U"
|
||||
"ninterpretedOption\"/\n\005CType\022\n\n\006STRING\020\000\022"
|
||||
"\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JSType\022\r\n"
|
||||
"\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS_NUMBER"
|
||||
"\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n\014OneofOptions\022C\n\024u"
|
||||
"ninterpreted_option\030\347\007 \003(\0132$.google.prot"
|
||||
"obuf.UninterpretedOption\":\n\014OptimizeMode"
|
||||
"\022\t\n\005SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTI"
|
||||
"ME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010&\020\'\"\354\001\n\016MessageOptions"
|
||||
"\022&\n\027message_set_wire_format\030\001 \001(\010:\005false"
|
||||
"\022.\n\037no_standard_descriptor_accessor\030\002 \001("
|
||||
"\010:\005false\022\031\n\ndeprecated\030\003 \001(\010:\005false\022\021\n\tm"
|
||||
"ap_entry\030\007 \001(\010\022C\n\024uninterpreted_option\030\347"
|
||||
"\007 \003(\0132$.google.protobuf.UninterpretedOpt"
|
||||
"ion*\t\010\350\007\020\200\200\200\200\002J\004\010\010\020\t\"\236\003\n\014FieldOptions\022:\n"
|
||||
"\005ctype\030\001 \001(\0162#.google.protobuf.FieldOpti"
|
||||
"ons.CType:\006STRING\022\016\n\006packed\030\002 \001(\010\022\?\n\006jst"
|
||||
"ype\030\006 \001(\0162$.google.protobuf.FieldOptions"
|
||||
".JSType:\tJS_NORMAL\022\023\n\004lazy\030\005 \001(\010:\005false\022"
|
||||
"\031\n\ndeprecated\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010"
|
||||
":\005false\022C\n\024uninterpreted_option\030\347\007 \003(\0132$"
|
||||
".google.protobuf.UninterpretedOption\"/\n\005"
|
||||
"CType\022\n\n\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PI"
|
||||
"ECE\020\002\"5\n\006JSType\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STR"
|
||||
"ING\020\001\022\r\n\tJS_NUMBER\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n"
|
||||
"\014OneofOptions\022C\n\024uninterpreted_option\030\347\007"
|
||||
" \003(\0132$.google.protobuf.UninterpretedOpti"
|
||||
"on*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013EnumOptions\022\023\n\013allow_a"
|
||||
"lias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005false\022C\n"
|
||||
"\024uninterpreted_option\030\347\007 \003(\0132$.google.pr"
|
||||
"otobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"}\n"
|
||||
"\020EnumValueOptions\022\031\n\ndeprecated\030\001 \001(\010:\005f"
|
||||
"alse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go"
|
||||
"ogle.protobuf.UninterpretedOption*\t\010\350\007\020\200"
|
||||
"\200\200\200\002\"{\n\016ServiceOptions\022\031\n\ndeprecated\030! \001"
|
||||
"(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003(\013"
|
||||
"2$.google.protobuf.UninterpretedOption*\t"
|
||||
"\010\350\007\020\200\200\200\200\002\"\255\002\n\rMethodOptions\022\031\n\ndeprecate"
|
||||
"d\030! \001(\010:\005false\022_\n\021idempotency_level\030\" \001("
|
||||
"\0162/.google.protobuf.MethodOptions.Idempo"
|
||||
"tencyLevel:\023IDEMPOTENCY_UNKNOWN\022C\n\024unint"
|
||||
"obuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013"
|
||||
"EnumOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndepr"
|
||||
"ecated\030\003 \001(\010:\005false\022C\n\024uninterpreted_opt"
|
||||
"ion\030\347\007 \003(\0132$.google.protobuf.Uninterpret"
|
||||
"edOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020EnumValueOptions\022"
|
||||
"\031\n\ndeprecated\030\001 \001(\010:\005false\022C\n\024uninterpre"
|
||||
"ted_option\030\347\007 \003(\0132$.google.protobuf.Unin"
|
||||
"terpretedOption*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOpt"
|
||||
"ions\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n\024unint"
|
||||
"erpreted_option\030\347\007 \003(\0132$.google.protobuf"
|
||||
".UninterpretedOption\"P\n\020IdempotencyLevel"
|
||||
"\022\027\n\023IDEMPOTENCY_UNKNOWN\020\000\022\023\n\017NO_SIDE_EFF"
|
||||
"ECTS\020\001\022\016\n\nIDEMPOTENT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023Un"
|
||||
"interpretedOption\022;\n\004name\030\002 \003(\0132-.google"
|
||||
".protobuf.UninterpretedOption.NamePart\022\030"
|
||||
"\n\020identifier_value\030\003 \001(\t\022\032\n\022positive_int"
|
||||
"_value\030\004 \001(\004\022\032\n\022negative_int_value\030\005 \001(\003"
|
||||
"\022\024\n\014double_value\030\006 \001(\001\022\024\n\014string_value\030\007"
|
||||
" \001(\014\022\027\n\017aggregate_value\030\010 \001(\t\0323\n\010NamePar"
|
||||
"t\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_extension\030\002 \002"
|
||||
"(\010\"\325\001\n\016SourceCodeInfo\022:\n\010location\030\001 \003(\0132"
|
||||
"(.google.protobuf.SourceCodeInfo.Locatio"
|
||||
"n\032\206\001\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span"
|
||||
"\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022\031\n\021"
|
||||
"trailing_comments\030\004 \001(\t\022!\n\031leading_detac"
|
||||
"hed_comments\030\006 \003(\t\"\247\001\n\021GeneratedCodeInfo"
|
||||
"\022A\n\nannotation\030\001 \003(\0132-.google.protobuf.G"
|
||||
"eneratedCodeInfo.Annotation\032O\n\nAnnotatio"
|
||||
"n\022\020\n\004path\030\001 \003(\005B\002\020\001\022\023\n\013source_file\030\002 \001(\t"
|
||||
"\022\r\n\005begin\030\003 \001(\005\022\013\n\003end\030\004 \001(\005BX\n\023com.goog"
|
||||
"le.protobufB\020DescriptorProtosH\001Z\ndescrip"
|
||||
"tor\242\002\003GPB\252\002\032Google.Protobuf.Reflection"
|
||||
".UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\255\002\n\rMeth"
|
||||
"odOptions\022\031\n\ndeprecated\030! \001(\010:\005false\022_\n\021"
|
||||
"idempotency_level\030\" \001(\0162/.google.protobu"
|
||||
"f.MethodOptions.IdempotencyLevel:\023IDEMPO"
|
||||
"TENCY_UNKNOWN\022C\n\024uninterpreted_option\030\347\007"
|
||||
" \003(\0132$.google.protobuf.UninterpretedOpti"
|
||||
"on\"P\n\020IdempotencyLevel\022\027\n\023IDEMPOTENCY_UN"
|
||||
"KNOWN\020\000\022\023\n\017NO_SIDE_EFFECTS\020\001\022\016\n\nIDEMPOTE"
|
||||
"NT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022"
|
||||
";\n\004name\030\002 \003(\0132-.google.protobuf.Uninterp"
|
||||
"retedOption.NamePart\022\030\n\020identifier_value"
|
||||
"\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022ne"
|
||||
"gative_int_value\030\005 \001(\003\022\024\n\014double_value\030\006"
|
||||
" \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_"
|
||||
"value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002"
|
||||
"(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016SourceCodeI"
|
||||
"nfo\022:\n\010location\030\001 \003(\0132(.google.protobuf."
|
||||
"SourceCodeInfo.Location\032\206\001\n\010Location\022\020\n\004"
|
||||
"path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020lead"
|
||||
"ing_comments\030\003 \001(\t\022\031\n\021trailing_comments\030"
|
||||
"\004 \001(\t\022!\n\031leading_detached_comments\030\006 \003(\t"
|
||||
"\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotation\030\001 \003"
|
||||
"(\0132-.google.protobuf.GeneratedCodeInfo.A"
|
||||
"nnotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020"
|
||||
"\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n"
|
||||
"\003end\030\004 \001(\005BX\n\023com.google.protobufB\020Descr"
|
||||
"iptorProtosH\001Z\ndescriptor\242\002\003GPB\252\002\032Google"
|
||||
".Protobuf.Reflection"
|
||||
};
|
||||
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
|
||||
descriptor, 5478);
|
||||
descriptor, 5500);
|
||||
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
|
||||
"google/protobuf/descriptor.proto", &protobuf_RegisterTypes);
|
||||
::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto);
|
||||
|
|
@ -7871,6 +7874,7 @@ const int FileOptions::kDeprecatedFieldNumber;
|
|||
const int FileOptions::kCcEnableArenasFieldNumber;
|
||||
const int FileOptions::kObjcClassPrefixFieldNumber;
|
||||
const int FileOptions::kCsharpNamespaceFieldNumber;
|
||||
const int FileOptions::kSwiftPrefixFieldNumber;
|
||||
const int FileOptions::kUninterpretedOptionFieldNumber;
|
||||
#endif // !defined(_MSC_VER) || _MSC_VER >= 1900
|
||||
|
||||
|
|
@ -7910,6 +7914,10 @@ FileOptions::FileOptions(const FileOptions& from)
|
|||
if (from.has_csharp_namespace()) {
|
||||
csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_);
|
||||
}
|
||||
swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
if (from.has_swift_prefix()) {
|
||||
swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_);
|
||||
}
|
||||
::memcpy(&java_multiple_files_, &from.java_multiple_files_,
|
||||
reinterpret_cast<char*>(&optimize_for_) -
|
||||
reinterpret_cast<char*>(&java_multiple_files_) + sizeof(optimize_for_));
|
||||
|
|
@ -7923,6 +7931,7 @@ void FileOptions::SharedCtor() {
|
|||
go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
::memset(&java_multiple_files_, 0, reinterpret_cast<char*>(&cc_enable_arenas_) -
|
||||
reinterpret_cast<char*>(&java_multiple_files_) + sizeof(cc_enable_arenas_));
|
||||
optimize_for_ = 1;
|
||||
|
|
@ -7939,6 +7948,7 @@ void FileOptions::SharedDtor() {
|
|||
go_package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
objc_class_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
csharp_namespace_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
swift_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
}
|
||||
|
||||
void FileOptions::SetCachedSize(int size) const {
|
||||
|
|
@ -7968,7 +7978,7 @@ void FileOptions::Clear() {
|
|||
// @@protoc_insertion_point(message_clear_start:google.protobuf.FileOptions)
|
||||
_extensions_.Clear();
|
||||
uninterpreted_option_.Clear();
|
||||
if (_has_bits_[0 / 32] & 31u) {
|
||||
if (_has_bits_[0 / 32] & 63u) {
|
||||
if (has_java_package()) {
|
||||
GOOGLE_DCHECK(!java_package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));
|
||||
(*java_package_.UnsafeRawStringPointer())->clear();
|
||||
|
|
@ -7989,14 +7999,18 @@ void FileOptions::Clear() {
|
|||
GOOGLE_DCHECK(!csharp_namespace_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));
|
||||
(*csharp_namespace_.UnsafeRawStringPointer())->clear();
|
||||
}
|
||||
if (has_swift_prefix()) {
|
||||
GOOGLE_DCHECK(!swift_prefix_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));
|
||||
(*swift_prefix_.UnsafeRawStringPointer())->clear();
|
||||
}
|
||||
}
|
||||
if (_has_bits_[0 / 32] & 224u) {
|
||||
::memset(&java_multiple_files_, 0, reinterpret_cast<char*>(&java_string_check_utf8_) -
|
||||
reinterpret_cast<char*>(&java_multiple_files_) + sizeof(java_string_check_utf8_));
|
||||
if (_has_bits_[0 / 32] & 192u) {
|
||||
::memset(&java_multiple_files_, 0, reinterpret_cast<char*>(&java_generate_equals_and_hash_) -
|
||||
reinterpret_cast<char*>(&java_multiple_files_) + sizeof(java_generate_equals_and_hash_));
|
||||
}
|
||||
if (_has_bits_[8 / 32] & 16128u) {
|
||||
::memset(&cc_generic_services_, 0, reinterpret_cast<char*>(&cc_enable_arenas_) -
|
||||
reinterpret_cast<char*>(&cc_generic_services_) + sizeof(cc_enable_arenas_));
|
||||
if (_has_bits_[8 / 32] & 32512u) {
|
||||
::memset(&java_string_check_utf8_, 0, reinterpret_cast<char*>(&cc_enable_arenas_) -
|
||||
reinterpret_cast<char*>(&java_string_check_utf8_) + sizeof(cc_enable_arenas_));
|
||||
optimize_for_ = 1;
|
||||
}
|
||||
_has_bits_.Clear();
|
||||
|
|
@ -8210,6 +8224,21 @@ bool FileOptions::MergePartialFromCodedStream(
|
|||
break;
|
||||
}
|
||||
|
||||
// optional string swift_prefix = 39;
|
||||
case 39: {
|
||||
if (tag == 314u) {
|
||||
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
||||
input, this->mutable_swift_prefix()));
|
||||
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
||||
this->swift_prefix().data(), this->swift_prefix().length(),
|
||||
::google::protobuf::internal::WireFormat::PARSE,
|
||||
"google.protobuf.FileOptions.swift_prefix");
|
||||
} else {
|
||||
goto handle_unusual;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
||||
case 999: {
|
||||
if (tag == 7994u) {
|
||||
|
|
@ -8349,6 +8378,16 @@ void FileOptions::SerializeWithCachedSizes(
|
|||
37, this->csharp_namespace(), output);
|
||||
}
|
||||
|
||||
// optional string swift_prefix = 39;
|
||||
if (has_swift_prefix()) {
|
||||
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
||||
this->swift_prefix().data(), this->swift_prefix().length(),
|
||||
::google::protobuf::internal::WireFormat::SERIALIZE,
|
||||
"google.protobuf.FileOptions.swift_prefix");
|
||||
::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
||||
39, this->swift_prefix(), output);
|
||||
}
|
||||
|
||||
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
||||
for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
||||
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
||||
|
|
@ -8471,6 +8510,17 @@ void FileOptions::SerializeWithCachedSizes(
|
|||
37, this->csharp_namespace(), target);
|
||||
}
|
||||
|
||||
// optional string swift_prefix = 39;
|
||||
if (has_swift_prefix()) {
|
||||
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
||||
this->swift_prefix().data(), this->swift_prefix().length(),
|
||||
::google::protobuf::internal::WireFormat::SERIALIZE,
|
||||
"google.protobuf.FileOptions.swift_prefix");
|
||||
target =
|
||||
::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
||||
39, this->swift_prefix(), target);
|
||||
}
|
||||
|
||||
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
||||
for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
||||
target = ::google::protobuf::internal::WireFormatLite::
|
||||
|
|
@ -8548,6 +8598,13 @@ size_t FileOptions::ByteSizeLong() const {
|
|||
this->csharp_namespace());
|
||||
}
|
||||
|
||||
// optional string swift_prefix = 39;
|
||||
if (has_swift_prefix()) {
|
||||
total_size += 2 +
|
||||
::google::protobuf::internal::WireFormatLite::StringSize(
|
||||
this->swift_prefix());
|
||||
}
|
||||
|
||||
// optional bool java_multiple_files = 10 [default = false];
|
||||
if (has_java_multiple_files()) {
|
||||
total_size += 1 + 1;
|
||||
|
|
@ -8558,13 +8615,13 @@ size_t FileOptions::ByteSizeLong() const {
|
|||
total_size += 2 + 1;
|
||||
}
|
||||
|
||||
}
|
||||
if (_has_bits_[8 / 32] & 32512u) {
|
||||
// optional bool java_string_check_utf8 = 27 [default = false];
|
||||
if (has_java_string_check_utf8()) {
|
||||
total_size += 2 + 1;
|
||||
}
|
||||
|
||||
}
|
||||
if (_has_bits_[8 / 32] & 16128u) {
|
||||
// optional bool cc_generic_services = 16 [default = false];
|
||||
if (has_cc_generic_services()) {
|
||||
total_size += 2 + 1;
|
||||
|
|
@ -8646,17 +8703,21 @@ void FileOptions::MergeFrom(const FileOptions& from) {
|
|||
set_has_csharp_namespace();
|
||||
csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_);
|
||||
}
|
||||
if (from.has_swift_prefix()) {
|
||||
set_has_swift_prefix();
|
||||
swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_);
|
||||
}
|
||||
if (from.has_java_multiple_files()) {
|
||||
set_java_multiple_files(from.java_multiple_files());
|
||||
}
|
||||
if (from.has_java_generate_equals_and_hash()) {
|
||||
set_java_generate_equals_and_hash(from.java_generate_equals_and_hash());
|
||||
}
|
||||
}
|
||||
if (from._has_bits_[8 / 32] & 32512u) {
|
||||
if (from.has_java_string_check_utf8()) {
|
||||
set_java_string_check_utf8(from.java_string_check_utf8());
|
||||
}
|
||||
}
|
||||
if (from._has_bits_[8 / 32] & 16128u) {
|
||||
if (from.has_cc_generic_services()) {
|
||||
set_cc_generic_services(from.cc_generic_services());
|
||||
}
|
||||
|
|
@ -8712,6 +8773,7 @@ void FileOptions::InternalSwap(FileOptions* other) {
|
|||
go_package_.Swap(&other->go_package_);
|
||||
objc_class_prefix_.Swap(&other->objc_class_prefix_);
|
||||
csharp_namespace_.Swap(&other->csharp_namespace_);
|
||||
swift_prefix_.Swap(&other->swift_prefix_);
|
||||
std::swap(java_multiple_files_, other->java_multiple_files_);
|
||||
std::swap(java_generate_equals_and_hash_, other->java_generate_equals_and_hash_);
|
||||
std::swap(java_string_check_utf8_, other->java_string_check_utf8_);
|
||||
|
|
@ -8845,13 +8907,13 @@ void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_c
|
|||
|
||||
// optional bool java_multiple_files = 10 [default = false];
|
||||
bool FileOptions::has_java_multiple_files() const {
|
||||
return (_has_bits_[0] & 0x00000020u) != 0;
|
||||
return (_has_bits_[0] & 0x00000040u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_java_multiple_files() {
|
||||
_has_bits_[0] |= 0x00000020u;
|
||||
_has_bits_[0] |= 0x00000040u;
|
||||
}
|
||||
void FileOptions::clear_has_java_multiple_files() {
|
||||
_has_bits_[0] &= ~0x00000020u;
|
||||
_has_bits_[0] &= ~0x00000040u;
|
||||
}
|
||||
void FileOptions::clear_java_multiple_files() {
|
||||
java_multiple_files_ = false;
|
||||
|
|
@ -8869,13 +8931,13 @@ void FileOptions::set_java_multiple_files(bool value) {
|
|||
|
||||
// optional bool java_generate_equals_and_hash = 20 [deprecated = true];
|
||||
bool FileOptions::has_java_generate_equals_and_hash() const {
|
||||
return (_has_bits_[0] & 0x00000040u) != 0;
|
||||
return (_has_bits_[0] & 0x00000080u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_java_generate_equals_and_hash() {
|
||||
_has_bits_[0] |= 0x00000040u;
|
||||
_has_bits_[0] |= 0x00000080u;
|
||||
}
|
||||
void FileOptions::clear_has_java_generate_equals_and_hash() {
|
||||
_has_bits_[0] &= ~0x00000040u;
|
||||
_has_bits_[0] &= ~0x00000080u;
|
||||
}
|
||||
void FileOptions::clear_java_generate_equals_and_hash() {
|
||||
java_generate_equals_and_hash_ = false;
|
||||
|
|
@ -8893,13 +8955,13 @@ void FileOptions::set_java_generate_equals_and_hash(bool value) {
|
|||
|
||||
// optional bool java_string_check_utf8 = 27 [default = false];
|
||||
bool FileOptions::has_java_string_check_utf8() const {
|
||||
return (_has_bits_[0] & 0x00000080u) != 0;
|
||||
return (_has_bits_[0] & 0x00000100u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_java_string_check_utf8() {
|
||||
_has_bits_[0] |= 0x00000080u;
|
||||
_has_bits_[0] |= 0x00000100u;
|
||||
}
|
||||
void FileOptions::clear_has_java_string_check_utf8() {
|
||||
_has_bits_[0] &= ~0x00000080u;
|
||||
_has_bits_[0] &= ~0x00000100u;
|
||||
}
|
||||
void FileOptions::clear_java_string_check_utf8() {
|
||||
java_string_check_utf8_ = false;
|
||||
|
|
@ -8917,13 +8979,13 @@ void FileOptions::set_java_string_check_utf8(bool value) {
|
|||
|
||||
// optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
||||
bool FileOptions::has_optimize_for() const {
|
||||
return (_has_bits_[0] & 0x00002000u) != 0;
|
||||
return (_has_bits_[0] & 0x00004000u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_optimize_for() {
|
||||
_has_bits_[0] |= 0x00002000u;
|
||||
_has_bits_[0] |= 0x00004000u;
|
||||
}
|
||||
void FileOptions::clear_has_optimize_for() {
|
||||
_has_bits_[0] &= ~0x00002000u;
|
||||
_has_bits_[0] &= ~0x00004000u;
|
||||
}
|
||||
void FileOptions::clear_optimize_for() {
|
||||
optimize_for_ = 1;
|
||||
|
|
@ -8996,13 +9058,13 @@ void FileOptions::set_allocated_go_package(::std::string* go_package) {
|
|||
|
||||
// optional bool cc_generic_services = 16 [default = false];
|
||||
bool FileOptions::has_cc_generic_services() const {
|
||||
return (_has_bits_[0] & 0x00000100u) != 0;
|
||||
return (_has_bits_[0] & 0x00000200u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_cc_generic_services() {
|
||||
_has_bits_[0] |= 0x00000100u;
|
||||
_has_bits_[0] |= 0x00000200u;
|
||||
}
|
||||
void FileOptions::clear_has_cc_generic_services() {
|
||||
_has_bits_[0] &= ~0x00000100u;
|
||||
_has_bits_[0] &= ~0x00000200u;
|
||||
}
|
||||
void FileOptions::clear_cc_generic_services() {
|
||||
cc_generic_services_ = false;
|
||||
|
|
@ -9020,13 +9082,13 @@ void FileOptions::set_cc_generic_services(bool value) {
|
|||
|
||||
// optional bool java_generic_services = 17 [default = false];
|
||||
bool FileOptions::has_java_generic_services() const {
|
||||
return (_has_bits_[0] & 0x00000200u) != 0;
|
||||
return (_has_bits_[0] & 0x00000400u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_java_generic_services() {
|
||||
_has_bits_[0] |= 0x00000200u;
|
||||
_has_bits_[0] |= 0x00000400u;
|
||||
}
|
||||
void FileOptions::clear_has_java_generic_services() {
|
||||
_has_bits_[0] &= ~0x00000200u;
|
||||
_has_bits_[0] &= ~0x00000400u;
|
||||
}
|
||||
void FileOptions::clear_java_generic_services() {
|
||||
java_generic_services_ = false;
|
||||
|
|
@ -9044,13 +9106,13 @@ void FileOptions::set_java_generic_services(bool value) {
|
|||
|
||||
// optional bool py_generic_services = 18 [default = false];
|
||||
bool FileOptions::has_py_generic_services() const {
|
||||
return (_has_bits_[0] & 0x00000400u) != 0;
|
||||
return (_has_bits_[0] & 0x00000800u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_py_generic_services() {
|
||||
_has_bits_[0] |= 0x00000400u;
|
||||
_has_bits_[0] |= 0x00000800u;
|
||||
}
|
||||
void FileOptions::clear_has_py_generic_services() {
|
||||
_has_bits_[0] &= ~0x00000400u;
|
||||
_has_bits_[0] &= ~0x00000800u;
|
||||
}
|
||||
void FileOptions::clear_py_generic_services() {
|
||||
py_generic_services_ = false;
|
||||
|
|
@ -9068,13 +9130,13 @@ void FileOptions::set_py_generic_services(bool value) {
|
|||
|
||||
// optional bool deprecated = 23 [default = false];
|
||||
bool FileOptions::has_deprecated() const {
|
||||
return (_has_bits_[0] & 0x00000800u) != 0;
|
||||
return (_has_bits_[0] & 0x00001000u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_deprecated() {
|
||||
_has_bits_[0] |= 0x00000800u;
|
||||
_has_bits_[0] |= 0x00001000u;
|
||||
}
|
||||
void FileOptions::clear_has_deprecated() {
|
||||
_has_bits_[0] &= ~0x00000800u;
|
||||
_has_bits_[0] &= ~0x00001000u;
|
||||
}
|
||||
void FileOptions::clear_deprecated() {
|
||||
deprecated_ = false;
|
||||
|
|
@ -9092,13 +9154,13 @@ void FileOptions::set_deprecated(bool value) {
|
|||
|
||||
// optional bool cc_enable_arenas = 31 [default = false];
|
||||
bool FileOptions::has_cc_enable_arenas() const {
|
||||
return (_has_bits_[0] & 0x00001000u) != 0;
|
||||
return (_has_bits_[0] & 0x00002000u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_cc_enable_arenas() {
|
||||
_has_bits_[0] |= 0x00001000u;
|
||||
_has_bits_[0] |= 0x00002000u;
|
||||
}
|
||||
void FileOptions::clear_has_cc_enable_arenas() {
|
||||
_has_bits_[0] &= ~0x00001000u;
|
||||
_has_bits_[0] &= ~0x00002000u;
|
||||
}
|
||||
void FileOptions::clear_cc_enable_arenas() {
|
||||
cc_enable_arenas_ = false;
|
||||
|
|
@ -9222,6 +9284,60 @@ void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace
|
|||
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
|
||||
}
|
||||
|
||||
// optional string swift_prefix = 39;
|
||||
bool FileOptions::has_swift_prefix() const {
|
||||
return (_has_bits_[0] & 0x00000020u) != 0;
|
||||
}
|
||||
void FileOptions::set_has_swift_prefix() {
|
||||
_has_bits_[0] |= 0x00000020u;
|
||||
}
|
||||
void FileOptions::clear_has_swift_prefix() {
|
||||
_has_bits_[0] &= ~0x00000020u;
|
||||
}
|
||||
void FileOptions::clear_swift_prefix() {
|
||||
swift_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
clear_has_swift_prefix();
|
||||
}
|
||||
const ::std::string& FileOptions::swift_prefix() const {
|
||||
// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.swift_prefix)
|
||||
return swift_prefix_.GetNoArena();
|
||||
}
|
||||
void FileOptions::set_swift_prefix(const ::std::string& value) {
|
||||
set_has_swift_prefix();
|
||||
swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
||||
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
void FileOptions::set_swift_prefix(const char* value) {
|
||||
set_has_swift_prefix();
|
||||
swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
||||
// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
void FileOptions::set_swift_prefix(const char* value, size_t size) {
|
||||
set_has_swift_prefix();
|
||||
swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
||||
::std::string(reinterpret_cast<const char*>(value), size));
|
||||
// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
::std::string* FileOptions::mutable_swift_prefix() {
|
||||
set_has_swift_prefix();
|
||||
// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.swift_prefix)
|
||||
return swift_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
}
|
||||
::std::string* FileOptions::release_swift_prefix() {
|
||||
// @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix)
|
||||
clear_has_swift_prefix();
|
||||
return swift_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
}
|
||||
void FileOptions::set_allocated_swift_prefix(::std::string* swift_prefix) {
|
||||
if (swift_prefix != NULL) {
|
||||
set_has_swift_prefix();
|
||||
} else {
|
||||
clear_has_swift_prefix();
|
||||
}
|
||||
swift_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), swift_prefix);
|
||||
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
|
||||
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
||||
int FileOptions::uninterpreted_option_size() const {
|
||||
return uninterpreted_option_.size();
|
||||
|
|
|
|||
|
|
@ -2235,6 +2235,18 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@p
|
|||
::std::string* release_csharp_namespace();
|
||||
void set_allocated_csharp_namespace(::std::string* csharp_namespace);
|
||||
|
||||
// optional string swift_prefix = 39;
|
||||
bool has_swift_prefix() const;
|
||||
void clear_swift_prefix();
|
||||
static const int kSwiftPrefixFieldNumber = 39;
|
||||
const ::std::string& swift_prefix() const;
|
||||
void set_swift_prefix(const ::std::string& value);
|
||||
void set_swift_prefix(const char* value);
|
||||
void set_swift_prefix(const char* value, size_t size);
|
||||
::std::string* mutable_swift_prefix();
|
||||
::std::string* release_swift_prefix();
|
||||
void set_allocated_swift_prefix(::std::string* swift_prefix);
|
||||
|
||||
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
||||
int uninterpreted_option_size() const;
|
||||
void clear_uninterpreted_option();
|
||||
|
|
@ -2278,6 +2290,8 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@p
|
|||
void clear_has_objc_class_prefix();
|
||||
void set_has_csharp_namespace();
|
||||
void clear_has_csharp_namespace();
|
||||
void set_has_swift_prefix();
|
||||
void clear_has_swift_prefix();
|
||||
|
||||
::google::protobuf::internal::ExtensionSet _extensions_;
|
||||
|
||||
|
|
@ -2290,6 +2304,7 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@p
|
|||
::google::protobuf::internal::ArenaStringPtr go_package_;
|
||||
::google::protobuf::internal::ArenaStringPtr objc_class_prefix_;
|
||||
::google::protobuf::internal::ArenaStringPtr csharp_namespace_;
|
||||
::google::protobuf::internal::ArenaStringPtr swift_prefix_;
|
||||
bool java_multiple_files_;
|
||||
bool java_generate_equals_and_hash_;
|
||||
bool java_string_check_utf8_;
|
||||
|
|
@ -6364,13 +6379,13 @@ inline void FileOptions::set_allocated_java_outer_classname(::std::string* java_
|
|||
|
||||
// optional bool java_multiple_files = 10 [default = false];
|
||||
inline bool FileOptions::has_java_multiple_files() const {
|
||||
return (_has_bits_[0] & 0x00000020u) != 0;
|
||||
return (_has_bits_[0] & 0x00000040u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_java_multiple_files() {
|
||||
_has_bits_[0] |= 0x00000020u;
|
||||
_has_bits_[0] |= 0x00000040u;
|
||||
}
|
||||
inline void FileOptions::clear_has_java_multiple_files() {
|
||||
_has_bits_[0] &= ~0x00000020u;
|
||||
_has_bits_[0] &= ~0x00000040u;
|
||||
}
|
||||
inline void FileOptions::clear_java_multiple_files() {
|
||||
java_multiple_files_ = false;
|
||||
|
|
@ -6388,13 +6403,13 @@ inline void FileOptions::set_java_multiple_files(bool value) {
|
|||
|
||||
// optional bool java_generate_equals_and_hash = 20 [deprecated = true];
|
||||
inline bool FileOptions::has_java_generate_equals_and_hash() const {
|
||||
return (_has_bits_[0] & 0x00000040u) != 0;
|
||||
return (_has_bits_[0] & 0x00000080u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_java_generate_equals_and_hash() {
|
||||
_has_bits_[0] |= 0x00000040u;
|
||||
_has_bits_[0] |= 0x00000080u;
|
||||
}
|
||||
inline void FileOptions::clear_has_java_generate_equals_and_hash() {
|
||||
_has_bits_[0] &= ~0x00000040u;
|
||||
_has_bits_[0] &= ~0x00000080u;
|
||||
}
|
||||
inline void FileOptions::clear_java_generate_equals_and_hash() {
|
||||
java_generate_equals_and_hash_ = false;
|
||||
|
|
@ -6412,13 +6427,13 @@ inline void FileOptions::set_java_generate_equals_and_hash(bool value) {
|
|||
|
||||
// optional bool java_string_check_utf8 = 27 [default = false];
|
||||
inline bool FileOptions::has_java_string_check_utf8() const {
|
||||
return (_has_bits_[0] & 0x00000080u) != 0;
|
||||
return (_has_bits_[0] & 0x00000100u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_java_string_check_utf8() {
|
||||
_has_bits_[0] |= 0x00000080u;
|
||||
_has_bits_[0] |= 0x00000100u;
|
||||
}
|
||||
inline void FileOptions::clear_has_java_string_check_utf8() {
|
||||
_has_bits_[0] &= ~0x00000080u;
|
||||
_has_bits_[0] &= ~0x00000100u;
|
||||
}
|
||||
inline void FileOptions::clear_java_string_check_utf8() {
|
||||
java_string_check_utf8_ = false;
|
||||
|
|
@ -6436,13 +6451,13 @@ inline void FileOptions::set_java_string_check_utf8(bool value) {
|
|||
|
||||
// optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
||||
inline bool FileOptions::has_optimize_for() const {
|
||||
return (_has_bits_[0] & 0x00002000u) != 0;
|
||||
return (_has_bits_[0] & 0x00004000u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_optimize_for() {
|
||||
_has_bits_[0] |= 0x00002000u;
|
||||
_has_bits_[0] |= 0x00004000u;
|
||||
}
|
||||
inline void FileOptions::clear_has_optimize_for() {
|
||||
_has_bits_[0] &= ~0x00002000u;
|
||||
_has_bits_[0] &= ~0x00004000u;
|
||||
}
|
||||
inline void FileOptions::clear_optimize_for() {
|
||||
optimize_for_ = 1;
|
||||
|
|
@ -6515,13 +6530,13 @@ inline void FileOptions::set_allocated_go_package(::std::string* go_package) {
|
|||
|
||||
// optional bool cc_generic_services = 16 [default = false];
|
||||
inline bool FileOptions::has_cc_generic_services() const {
|
||||
return (_has_bits_[0] & 0x00000100u) != 0;
|
||||
return (_has_bits_[0] & 0x00000200u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_cc_generic_services() {
|
||||
_has_bits_[0] |= 0x00000100u;
|
||||
_has_bits_[0] |= 0x00000200u;
|
||||
}
|
||||
inline void FileOptions::clear_has_cc_generic_services() {
|
||||
_has_bits_[0] &= ~0x00000100u;
|
||||
_has_bits_[0] &= ~0x00000200u;
|
||||
}
|
||||
inline void FileOptions::clear_cc_generic_services() {
|
||||
cc_generic_services_ = false;
|
||||
|
|
@ -6539,13 +6554,13 @@ inline void FileOptions::set_cc_generic_services(bool value) {
|
|||
|
||||
// optional bool java_generic_services = 17 [default = false];
|
||||
inline bool FileOptions::has_java_generic_services() const {
|
||||
return (_has_bits_[0] & 0x00000200u) != 0;
|
||||
return (_has_bits_[0] & 0x00000400u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_java_generic_services() {
|
||||
_has_bits_[0] |= 0x00000200u;
|
||||
_has_bits_[0] |= 0x00000400u;
|
||||
}
|
||||
inline void FileOptions::clear_has_java_generic_services() {
|
||||
_has_bits_[0] &= ~0x00000200u;
|
||||
_has_bits_[0] &= ~0x00000400u;
|
||||
}
|
||||
inline void FileOptions::clear_java_generic_services() {
|
||||
java_generic_services_ = false;
|
||||
|
|
@ -6563,13 +6578,13 @@ inline void FileOptions::set_java_generic_services(bool value) {
|
|||
|
||||
// optional bool py_generic_services = 18 [default = false];
|
||||
inline bool FileOptions::has_py_generic_services() const {
|
||||
return (_has_bits_[0] & 0x00000400u) != 0;
|
||||
return (_has_bits_[0] & 0x00000800u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_py_generic_services() {
|
||||
_has_bits_[0] |= 0x00000400u;
|
||||
_has_bits_[0] |= 0x00000800u;
|
||||
}
|
||||
inline void FileOptions::clear_has_py_generic_services() {
|
||||
_has_bits_[0] &= ~0x00000400u;
|
||||
_has_bits_[0] &= ~0x00000800u;
|
||||
}
|
||||
inline void FileOptions::clear_py_generic_services() {
|
||||
py_generic_services_ = false;
|
||||
|
|
@ -6587,13 +6602,13 @@ inline void FileOptions::set_py_generic_services(bool value) {
|
|||
|
||||
// optional bool deprecated = 23 [default = false];
|
||||
inline bool FileOptions::has_deprecated() const {
|
||||
return (_has_bits_[0] & 0x00000800u) != 0;
|
||||
return (_has_bits_[0] & 0x00001000u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_deprecated() {
|
||||
_has_bits_[0] |= 0x00000800u;
|
||||
_has_bits_[0] |= 0x00001000u;
|
||||
}
|
||||
inline void FileOptions::clear_has_deprecated() {
|
||||
_has_bits_[0] &= ~0x00000800u;
|
||||
_has_bits_[0] &= ~0x00001000u;
|
||||
}
|
||||
inline void FileOptions::clear_deprecated() {
|
||||
deprecated_ = false;
|
||||
|
|
@ -6611,13 +6626,13 @@ inline void FileOptions::set_deprecated(bool value) {
|
|||
|
||||
// optional bool cc_enable_arenas = 31 [default = false];
|
||||
inline bool FileOptions::has_cc_enable_arenas() const {
|
||||
return (_has_bits_[0] & 0x00001000u) != 0;
|
||||
return (_has_bits_[0] & 0x00002000u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_cc_enable_arenas() {
|
||||
_has_bits_[0] |= 0x00001000u;
|
||||
_has_bits_[0] |= 0x00002000u;
|
||||
}
|
||||
inline void FileOptions::clear_has_cc_enable_arenas() {
|
||||
_has_bits_[0] &= ~0x00001000u;
|
||||
_has_bits_[0] &= ~0x00002000u;
|
||||
}
|
||||
inline void FileOptions::clear_cc_enable_arenas() {
|
||||
cc_enable_arenas_ = false;
|
||||
|
|
@ -6741,6 +6756,60 @@ inline void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_na
|
|||
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
|
||||
}
|
||||
|
||||
// optional string swift_prefix = 39;
|
||||
inline bool FileOptions::has_swift_prefix() const {
|
||||
return (_has_bits_[0] & 0x00000020u) != 0;
|
||||
}
|
||||
inline void FileOptions::set_has_swift_prefix() {
|
||||
_has_bits_[0] |= 0x00000020u;
|
||||
}
|
||||
inline void FileOptions::clear_has_swift_prefix() {
|
||||
_has_bits_[0] &= ~0x00000020u;
|
||||
}
|
||||
inline void FileOptions::clear_swift_prefix() {
|
||||
swift_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
clear_has_swift_prefix();
|
||||
}
|
||||
inline const ::std::string& FileOptions::swift_prefix() const {
|
||||
// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.swift_prefix)
|
||||
return swift_prefix_.GetNoArena();
|
||||
}
|
||||
inline void FileOptions::set_swift_prefix(const ::std::string& value) {
|
||||
set_has_swift_prefix();
|
||||
swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
||||
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
inline void FileOptions::set_swift_prefix(const char* value) {
|
||||
set_has_swift_prefix();
|
||||
swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
||||
// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
inline void FileOptions::set_swift_prefix(const char* value, size_t size) {
|
||||
set_has_swift_prefix();
|
||||
swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
||||
::std::string(reinterpret_cast<const char*>(value), size));
|
||||
// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
inline ::std::string* FileOptions::mutable_swift_prefix() {
|
||||
set_has_swift_prefix();
|
||||
// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.swift_prefix)
|
||||
return swift_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
}
|
||||
inline ::std::string* FileOptions::release_swift_prefix() {
|
||||
// @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix)
|
||||
clear_has_swift_prefix();
|
||||
return swift_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
||||
}
|
||||
inline void FileOptions::set_allocated_swift_prefix(::std::string* swift_prefix) {
|
||||
if (swift_prefix != NULL) {
|
||||
set_has_swift_prefix();
|
||||
} else {
|
||||
clear_has_swift_prefix();
|
||||
}
|
||||
swift_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), swift_prefix);
|
||||
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix)
|
||||
}
|
||||
|
||||
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
||||
inline int FileOptions::uninterpreted_option_size() const {
|
||||
return uninterpreted_option_.size();
|
||||
|
|
|
|||
|
|
@ -366,6 +366,12 @@ message FileOptions {
|
|||
// Namespace for generated classes; defaults to the package.
|
||||
optional string csharp_namespace = 37;
|
||||
|
||||
// By default Swift generators will take the proto package and CamelCase it
|
||||
// replacing '.' with underscore and use that to prefix the types/symbols
|
||||
// defined. When this options is provided, they will use this value instead
|
||||
// to prefix the types/symbols defined.
|
||||
optional string swift_prefix = 39;
|
||||
|
||||
// The parser stores options it doesn't recognize here. See above.
|
||||
repeated UninterpretedOption uninterpreted_option = 999;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue