aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/descriptor.proto
diff options
context:
space:
mode:
authorGravatar Jon Skeet <jonskeet@google.com>2015-09-01 15:29:15 +0100
committerGravatar Jon Skeet <jonskeet@google.com>2015-09-01 15:29:15 +0100
commit75a18a39ca52fefb63e0821997e088c499d2c879 (patch)
tree161925ecddda6728bb623d73cc4fdcbf607eac7c /src/google/protobuf/descriptor.proto
parent5eb1fac9831676526ed9df4641b9740f977eaf4e (diff)
Specify csharp_namespace in descriptor.proto
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
-rw-r--r--src/google/protobuf/descriptor.proto3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index 8f90a956..bd02ed9b 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -43,8 +43,7 @@ package google.protobuf;
option go_package = "descriptor";
option java_package = "com.google.protobuf";
option java_outer_classname = "DescriptorProtos";
-// Re-enable this once the tools have picked up the csharp_namespace option.
-// option csharp_namespace = "Google.ProtocolBuffers.DescriptorProtos";
+option csharp_namespace = "Google.Protobuf.Reflection";
option objc_class_prefix = "GPB";
// descriptor.proto must be optimized for speed because reflection-based