temporarily removing csharp_umbrella_namespace file option

src/google/protobuf/compiler/csharp/csharp_helpers.cc

@@ -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++) {

src/google/protobuf/descriptor.pb.h

@@ -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();

src/google/protobuf/descriptor.proto

@@ -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;