Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

temporarily removing csharp_umbrella_namespace file option

Browse Source
pull/288/head
Jan Tattermusch 10 years ago
parent 83a5991d12
commit 8e190d498c
4 changed files with 46 additions and 233 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/google/protobuf/compiler/csharp/csharp_helpers.cc
  2. 200
      src/google/protobuf/descriptor.pb.cc
  3. 68
      src/google/protobuf/descriptor.pb.h
  4. 7
      src/google/protobuf/descriptor.proto

4
src/google/protobuf/compiler/csharp/csharp_helpers.cc
Unescape View File

@ -127,9 +127,7 @@ std::string GetFileUmbrellaClassname(const FileDescriptor* descriptor) {
}
std::string GetFileUmbrellaNamespace(const FileDescriptor* descriptor) {
if (descriptor->options().has_csharp_umbrella_namespace()) {
return descriptor->options().csharp_umbrella_namespace();
}
// TODO(jtattermusch): reintroduce csharp_umbrella_namespace option
bool collision = false;
std::string umbrella_classname = GetFileUmbrellaClassname(descriptor);
for(int i = 0; i < descriptor->message_type_count(); i++) {

200
src/google/protobuf/descriptor.pb.cc
Unescape View File

@ -289,7 +289,7 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_),
-1);
FileOptions_descriptor_ = file->message_type(9);
static const int FileOptions_offsets_[16] = {
static const int FileOptions_offsets_[15] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_package_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_outer_classname_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_multiple_files_),
@ -304,7 +304,6 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() {
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, csharp_umbrella_namespace_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, uninterpreted_option_),
};
FileOptions_reflection_ =
@ -665,7 +664,7 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() {
"t_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.google.p"
"rotobuf.MethodOptions\022\037\n\020client_streamin"
"g\030\005 \001(\010:\005false\022\037\n\020server_streaming\030\006 \001(\010"
":\005false\"\244\005\n\013FileOptions\022\024\n\014java_package\030"
":\005false\"\201\005\n\013FileOptions\022\024\n\014java_package\030"
"\001 \001(\t\022\034\n\024java_outer_classname\030\010 \001(\t\022\"\n\023j"
"ava_multiple_files\030\n \001(\010:\005false\022,\n\035java_"
"generate_equals_and_hash\030\024 \001(\010:\005false\022%\n"
@ -677,51 +676,51 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() {
"se\022\"\n\023py_generic_services\030\022 \001(\010:\005false\022\031"
"\n\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enable_a"
"renas\030\037 \001(\010:\005false\022\031\n\021objc_class_prefix\030"
"$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022!\n\031cshar"
"p_umbrella_namespace\030& \001(\t\022C\n\024uninterpre"
"ted_option\030\347\007 \003(\0132$.google.protobuf.Unin"
"terpretedOption\":\n\014OptimizeMode\022\t\n\005SPEED"
"\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007"
"\020\200\200\200\200\002\"\346\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\ndep"
"recated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\022"
"$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022C\n\024unint"
"erpreted_option\030\347\007 \003(\0132$.google.protobuf"
".UninterpretedOption\":\n\014OptimizeMode\022\t\n\005"
"SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003"
"*\t\010\350\007\020\200\200\200\200\002\"\346\001\n\016MessageOptions\022&\n\027messag"
"e_set_wire_format\030\001 \001(\010:\005false\022.\n\037no_sta"
"ndard_descriptor_accessor\030\002 \001(\010:\005false\022\031"
"\n\ndeprecated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007"
" \001(\010\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go"
"ogle.protobuf.UninterpretedOption*\t\010\350\007\020\200"
"\200\200\200\002\"\240\002\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.g"
"oogle.protobuf.FieldOptions.CType:\006STRIN"
"G\022\016\n\006packed\030\002 \001(\010\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\005C"
"Type\022\n\n\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIE"
"CE\020\002*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013EnumOptions\022\023\n\013allow"
"_alias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005false\022"
"C\n\024uninterpreted_option\030\347\007 \003(\0132$.google."
"protobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\""
"\240\002\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.google"
".protobuf.FieldOptions.CType:\006STRING\022\016\n\006"
"packed\030\002 \001(\010\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndep"
"recated\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010:\005fals"
"e\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.googl"
"e.protobuf.UninterpretedOption\"/\n\005CType\022"
"\n\n\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002*"
"\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013EnumOptions\022\023\n\013allow_alia"
"s\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005false\022C\n\024un"
"interpreted_option\030\347\007 \003(\0132$.google.proto"
"buf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020En"
"umValueOptions\022\031\n\ndeprecated\030\001 \001(\010:\005fals"
"e\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.googl"
"e.protobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200"
"\002\"{\n\016ServiceOptions\022\031\n\ndeprecated\030! \001(\010:"
"}\n\020EnumValueOptions\022\031\n\ndeprecated\030\001 \001(\010:"
"\005false\022C\n\024uninterpreted_option\030\347\007 \003(\0132$."
"google.protobuf.UninterpretedOption*\t\010\350\007"
"\020\200\200\200\200\002\"z\n\rMethodOptions\022\031\n\ndeprecated\030! "
"\001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003("
"\0132$.google.protobuf.UninterpretedOption*"
"\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022;\n\004na"
"me\030\002 \003(\0132-.google.protobuf.Uninterpreted"
"Option.NamePart\022\030\n\020identifier_value\030\003 \001("
"\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022negativ"
"e_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\016SourceCodeInfo\022:"
"\n\010location\030\001 \003(\0132(.google.protobuf.Sourc"
"eCodeInfo.Location\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_c"
"omments\030\003 \001(\t\022\031\n\021trailing_comments\030\004 \001(\t"
"\022!\n\031leading_detached_comments\030\006 \003(\tB)\n\023c"
"om.google.protobufB\020DescriptorProtosH\001", 4678);
"\020\200\200\200\200\002\"{\n\016ServiceOptions\022\031\n\ndeprecated\030!"
" \001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003"
"(\0132$.google.protobuf.UninterpretedOption"
"*\t\010\350\007\020\200\200\200\200\002\"z\n\rMethodOptions\022\031\n\ndeprecat"
"ed\030! \001(\010:\005false\022C\n\024uninterpreted_option\030"
"\347\007 \003(\0132$.google.protobuf.UninterpretedOp"
"tion*\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"
"B)\n\023com.google.protobufB\020DescriptorProto"
"sH\001", 4643);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"google/protobuf/descriptor.proto", &protobuf_RegisterTypes);
FileDescriptorSet::default_instance_ = new FileDescriptorSet();
@ -7020,7 +7019,6 @@ const int FileOptions::kDeprecatedFieldNumber;
const int FileOptions::kCcEnableArenasFieldNumber;
const int FileOptions::kObjcClassPrefixFieldNumber;
const int FileOptions::kCsharpNamespaceFieldNumber;
const int FileOptions::kCsharpUmbrellaNamespaceFieldNumber;
const int FileOptions::kUninterpretedOptionFieldNumber;
#endif // !_MSC_VER
@ -7058,7 +7056,6 @@ void FileOptions::SharedCtor() {
cc_enable_arenas_ = false;
objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
csharp_umbrella_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@ -7073,7 +7070,6 @@ 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());
csharp_umbrella_namespace_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
if (this != default_instance_) {
}
}
@ -7126,7 +7122,7 @@ void FileOptions::Clear() {
go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
}
if (_has_bits_[8 / 32] & 32512) {
if (_has_bits_[8 / 32] & 16128) {
ZR_(java_generic_services_, cc_enable_arenas_);
if (has_objc_class_prefix()) {
objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@ -7134,9 +7130,6 @@ void FileOptions::Clear() {
if (has_csharp_namespace()) {
csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
if (has_csharp_umbrella_namespace()) {
csharp_umbrella_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
}
#undef ZR_HELPER_
@ -7379,23 +7372,6 @@ bool FileOptions::MergePartialFromCodedStream(
} else {
goto handle_unusual;
}
if (input->ExpectTag(306)) goto parse_csharp_umbrella_namespace;
break;
}
// optional string csharp_umbrella_namespace = 38;
case 38: {
if (tag == 306) {
parse_csharp_umbrella_namespace:
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_csharp_umbrella_namespace()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->csharp_umbrella_namespace().data(), this->csharp_umbrella_namespace().length(),
::google::protobuf::internal::WireFormat::PARSE,
"google.protobuf.FileOptions.csharp_umbrella_namespace");
} else {
goto handle_unusual;
}
if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
break;
}
@ -7540,16 +7516,6 @@ void FileOptions::SerializeWithCachedSizes(
37, this->csharp_namespace(), output);
}
// optional string csharp_umbrella_namespace = 38;
if (has_csharp_umbrella_namespace()) {
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->csharp_umbrella_namespace().data(), this->csharp_umbrella_namespace().length(),
::google::protobuf::internal::WireFormat::SERIALIZE,
"google.protobuf.FileOptions.csharp_umbrella_namespace");
::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
38, this->csharp_umbrella_namespace(), 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(
@ -7671,17 +7637,6 @@ void FileOptions::SerializeWithCachedSizes(
37, this->csharp_namespace(), target);
}
// optional string csharp_umbrella_namespace = 38;
if (has_csharp_umbrella_namespace()) {
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->csharp_umbrella_namespace().data(), this->csharp_umbrella_namespace().length(),
::google::protobuf::internal::WireFormat::SERIALIZE,
"google.protobuf.FileOptions.csharp_umbrella_namespace");
target =
::google::protobuf::internal::WireFormatLite::WriteStringToArray(
38, this->csharp_umbrella_namespace(), 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::
@ -7753,7 +7708,7 @@ int FileOptions::ByteSize() const {
}
}
if (_has_bits_[8 / 32] & 32512) {
if (_has_bits_[8 / 32] & 16128) {
// optional bool java_generic_services = 17 [default = false];
if (has_java_generic_services()) {
total_size += 2 + 1;
@ -7788,13 +7743,6 @@ int FileOptions::ByteSize() const {
this->csharp_namespace());
}
// optional string csharp_umbrella_namespace = 38;
if (has_csharp_umbrella_namespace()) {
total_size += 2 +
::google::protobuf::internal::WireFormatLite::StringSize(
this->csharp_umbrella_namespace());
}
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
total_size += 2 * this->uninterpreted_option_size();
@ -7882,10 +7830,6 @@ void FileOptions::MergeFrom(const FileOptions& from) {
set_has_csharp_namespace();
csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_);
}
if (from.has_csharp_umbrella_namespace()) {
set_has_csharp_umbrella_namespace();
csharp_umbrella_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_umbrella_namespace_);
}
}
_extensions_.MergeFrom(from._extensions_);
if (from._internal_metadata_.have_unknown_fields()) {
@ -7931,7 +7875,6 @@ void FileOptions::InternalSwap(FileOptions* other) {
std::swap(cc_enable_arenas_, other->cc_enable_arenas_);
objc_class_prefix_.Swap(&other->objc_class_prefix_);
csharp_namespace_.Swap(&other->csharp_namespace_);
csharp_umbrella_namespace_.Swap(&other->csharp_umbrella_namespace_);
uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);
std::swap(_has_bits_[0], other->_has_bits_[0]);
_internal_metadata_.Swap(&other->_internal_metadata_);
@ -8432,59 +8375,6 @@ void FileOptions::InternalSwap(FileOptions* other) {
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
}
// optional string csharp_umbrella_namespace = 38;
bool FileOptions::has_csharp_umbrella_namespace() const {
return (_has_bits_[0] & 0x00004000u) != 0;
}
void FileOptions::set_has_csharp_umbrella_namespace() {
_has_bits_[0] |= 0x00004000u;
}
void FileOptions::clear_has_csharp_umbrella_namespace() {
_has_bits_[0] &= ~0x00004000u;
}
void FileOptions::clear_csharp_umbrella_namespace() {
csharp_umbrella_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
clear_has_csharp_umbrella_namespace();
}
const ::std::string& FileOptions::csharp_umbrella_namespace() const {
// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_umbrella_namespace)
return csharp_umbrella_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
void FileOptions::set_csharp_umbrella_namespace(const ::std::string& value) {
set_has_csharp_umbrella_namespace();
csharp_umbrella_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
void FileOptions::set_csharp_umbrella_namespace(const char* value) {
set_has_csharp_umbrella_namespace();
csharp_umbrella_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
void FileOptions::set_csharp_umbrella_namespace(const char* value, size_t size) {
set_has_csharp_umbrella_namespace();
csharp_umbrella_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
::std::string(reinterpret_cast<const char*>(value), size));
// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
::std::string* FileOptions::mutable_csharp_umbrella_namespace() {
set_has_csharp_umbrella_namespace();
// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.csharp_umbrella_namespace)
return csharp_umbrella_namespace_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
::std::string* FileOptions::release_csharp_umbrella_namespace() {
clear_has_csharp_umbrella_namespace();
return csharp_umbrella_namespace_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
void FileOptions::set_allocated_csharp_umbrella_namespace(::std::string* csharp_umbrella_namespace) {
if (csharp_umbrella_namespace != NULL) {
set_has_csharp_umbrella_namespace();
} else {
clear_has_csharp_umbrella_namespace();
}
csharp_umbrella_namespace_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), csharp_umbrella_namespace);
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
int FileOptions::uninterpreted_option_size() const {
return uninterpreted_option_.size();

68
src/google/protobuf/descriptor.pb.h
Unescape View File

@ -1849,18 +1849,6 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
::std::string* release_csharp_namespace();
void set_allocated_csharp_namespace(::std::string* csharp_namespace);
// optional string csharp_umbrella_namespace = 38;
bool has_csharp_umbrella_namespace() const;
void clear_csharp_umbrella_namespace();
static const int kCsharpUmbrellaNamespaceFieldNumber = 38;
const ::std::string& csharp_umbrella_namespace() const;
void set_csharp_umbrella_namespace(const ::std::string& value);
void set_csharp_umbrella_namespace(const char* value);
void set_csharp_umbrella_namespace(const char* value, size_t size);
::std::string* mutable_csharp_umbrella_namespace();
::std::string* release_csharp_umbrella_namespace();
void set_allocated_csharp_umbrella_namespace(::std::string* csharp_umbrella_namespace);
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
int uninterpreted_option_size() const;
void clear_uninterpreted_option();
@ -1904,8 +1892,6 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
inline void clear_has_objc_class_prefix();
inline void set_has_csharp_namespace();
inline void clear_has_csharp_namespace();
inline void set_has_csharp_umbrella_namespace();
inline void clear_has_csharp_umbrella_namespace();
::google::protobuf::internal::ExtensionSet _extensions_;
@ -1922,7 +1908,6 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
::google::protobuf::internal::ArenaStringPtr go_package_;
::google::protobuf::internal::ArenaStringPtr objc_class_prefix_;
::google::protobuf::internal::ArenaStringPtr csharp_namespace_;
::google::protobuf::internal::ArenaStringPtr csharp_umbrella_namespace_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
bool java_generic_services_;
bool py_generic_services_;
@ -5585,59 +5570,6 @@ inline void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_na
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
}
// optional string csharp_umbrella_namespace = 38;
inline bool FileOptions::has_csharp_umbrella_namespace() const {
return (_has_bits_[0] & 0x00004000u) != 0;
}
inline void FileOptions::set_has_csharp_umbrella_namespace() {
_has_bits_[0] |= 0x00004000u;
}
inline void FileOptions::clear_has_csharp_umbrella_namespace() {
_has_bits_[0] &= ~0x00004000u;
}
inline void FileOptions::clear_csharp_umbrella_namespace() {
csharp_umbrella_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
clear_has_csharp_umbrella_namespace();
}
inline const ::std::string& FileOptions::csharp_umbrella_namespace() const {
// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_umbrella_namespace)
return csharp_umbrella_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
inline void FileOptions::set_csharp_umbrella_namespace(const ::std::string& value) {
set_has_csharp_umbrella_namespace();
csharp_umbrella_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
inline void FileOptions::set_csharp_umbrella_namespace(const char* value) {
set_has_csharp_umbrella_namespace();
csharp_umbrella_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
inline void FileOptions::set_csharp_umbrella_namespace(const char* value, size_t size) {
set_has_csharp_umbrella_namespace();
csharp_umbrella_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
::std::string(reinterpret_cast<const char*>(value), size));
// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
inline ::std::string* FileOptions::mutable_csharp_umbrella_namespace() {
set_has_csharp_umbrella_namespace();
// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.csharp_umbrella_namespace)
return csharp_umbrella_namespace_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
inline ::std::string* FileOptions::release_csharp_umbrella_namespace() {
clear_has_csharp_umbrella_namespace();
return csharp_umbrella_namespace_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
inline void FileOptions::set_allocated_csharp_umbrella_namespace(::std::string* csharp_umbrella_namespace) {
if (csharp_umbrella_namespace != NULL) {
set_has_csharp_umbrella_namespace();
} else {
clear_has_csharp_umbrella_namespace();
}
csharp_umbrella_namespace_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), csharp_umbrella_namespace);
// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_umbrella_namespace)
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
inline int FileOptions::uninterpreted_option_size() const {
return uninterpreted_option_.size();

7
src/google/protobuf/descriptor.proto
Unescape View File

@ -354,13 +354,6 @@ message FileOptions {
// Namespace for generated classes; defaults to the package.
optional string csharp_namespace = 37;
// A nested namespace for the umbrella class, which contains metadata about
// all the messages within the file. This option is helpful for name
// collisions between the umbrella class and an existing type. This will be
// automatically set to 'Proto' if a collision is detected with types being
// generated.
optional string csharp_umbrella_namespace = 38;
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;

Write Preview
Loading…
Cancel
Save