aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/csharp/csharp_message.cc
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2015-07-29 20:15:03 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2015-07-30 14:54:09 -0700
commit43a2dee7085f91d7a7a55f21f0d6c474b7a83c7c (patch)
tree7be44c737bf985b2c9f2a56acb48a1a8069d16e4 /src/google/protobuf/compiler/csharp/csharp_message.cc
parent12febd0a7611858eb026fab7eaf8a4d14c4eba80 (diff)
refactor umbrella class helpers
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_message.cc')
-rw-r--r--src/google/protobuf/compiler/csharp/csharp_message.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc
index 54e7d92d..6ea568ca 100644
--- a/src/google/protobuf/compiler/csharp/csharp_message.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_message.cc
@@ -100,7 +100,6 @@ void MessageGenerator::Generate(io::Printer* printer) {
map<string, string> vars;
vars["class_name"] = class_name();
vars["access_level"] = class_access_level();
- vars["umbrella_class_name"] = GetFullUmbrellaClassName(descriptor_->file());
printer->Print(
"[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n");
@@ -118,7 +117,7 @@ void MessageGenerator::Generate(io::Printer* printer) {
// Access the message descriptor via the relevant file descriptor or containing message descriptor.
if (!descriptor_->containing_type()) {
- vars["descriptor_accessor"] = GetFullUmbrellaClassName(descriptor_->file())
+ vars["descriptor_accessor"] = GetUmbrellaClassName(descriptor_->file())
+ ".Descriptor.MessageTypes[" + SimpleItoa(descriptor_->index()) + "]";
} else {
vars["descriptor_accessor"] = GetClassName(descriptor_->containing_type())