diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-04-17 11:07:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-04-17 11:07:02 -0700 |
| commit | 8e190d498c9e402c787e70cde4afc7124393bea6 (patch) | |
| tree | e228faca7cde729ae4be9fc25afedb79197e1cc0 /src/google/protobuf/compiler/csharp/csharp_helpers.cc | |
| parent | 83a5991d12ecabc3388c99d121892a488ea8ee97 (diff) | |
temporarily removing csharp_umbrella_namespace file option
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_helpers.cc')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_helpers.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_helpers.cc b/src/google/protobuf/compiler/csharp/csharp_helpers.cc index cae12e2e..4580b7be 100644 --- a/src/google/protobuf/compiler/csharp/csharp_helpers.cc +++ b/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++) { |