From ffa2e377f3fc884f2c59ac0b942ad55b4037f76b Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Mon, 18 May 2015 12:48:21 -0400
Subject: Post csharp landing fixup.

Re-add the objc prefix that got removed by accident.
Regenerate the generated descriptors (C++ and ObjC).
---
 objectivec/google/protobuf/Descriptor.pbobjc.h |  5 +++++
 objectivec/google/protobuf/Descriptor.pbobjc.m | 13 +++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'objectivec/google')

diff --git a/objectivec/google/protobuf/Descriptor.pbobjc.h b/objectivec/google/protobuf/Descriptor.pbobjc.h
index 7b11d899..e3dacf25 100644
--- a/objectivec/google/protobuf/Descriptor.pbobjc.h
+++ b/objectivec/google/protobuf/Descriptor.pbobjc.h
@@ -467,6 +467,7 @@ typedef GPB_ENUM(GPBFileOptions_FieldNumber) {
   GPBFileOptions_FieldNumber_JavaStringCheckUtf8 = 27,
   GPBFileOptions_FieldNumber_CcEnableArenas = 31,
   GPBFileOptions_FieldNumber_ObjcClassPrefix = 36,
+  GPBFileOptions_FieldNumber_CsharpNamespace = 37,
   GPBFileOptions_FieldNumber_UninterpretedOptionArray = 999,
 };
 
@@ -565,6 +566,10 @@ typedef GPB_ENUM(GPBFileOptions_FieldNumber) {
 @property(nonatomic, readwrite) BOOL hasObjcClassPrefix;
 @property(nonatomic, readwrite, copy) NSString *objcClassPrefix;
 
+// Namespace for generated classes; defaults to the package.
+@property(nonatomic, readwrite) BOOL hasCsharpNamespace;
+@property(nonatomic, readwrite, copy) NSString *csharpNamespace;
+
 // The parser stores options it doesn't recognize here. See above.
 // |uninterpretedOptionArray| contains |GPBUninterpretedOption|
 @property(nonatomic, readwrite, strong) NSMutableArray *uninterpretedOptionArray;
diff --git a/objectivec/google/protobuf/Descriptor.pbobjc.m b/objectivec/google/protobuf/Descriptor.pbobjc.m
index b7d2e64f..25e4cc73 100644
--- a/objectivec/google/protobuf/Descriptor.pbobjc.m
+++ b/objectivec/google/protobuf/Descriptor.pbobjc.m
@@ -1105,6 +1105,7 @@ typedef struct GPBMethodDescriptorProto_Storage {
 @dynamic hasDeprecated, deprecated;
 @dynamic hasCcEnableArenas, ccEnableArenas;
 @dynamic hasObjcClassPrefix, objcClassPrefix;
+@dynamic hasCsharpNamespace, csharpNamespace;
 @dynamic uninterpretedOptionArray;
 
 typedef struct GPBFileOptions_Storage {
@@ -1122,6 +1123,7 @@ typedef struct GPBFileOptions_Storage {
   NSString *javaOuterClassname;
   NSString *goPackage;
   NSString *objcClassPrefix;
+  NSString *csharpNamespace;
   NSMutableArray *uninterpretedOptionArray;
 } GPBFileOptions_Storage;
 
@@ -1274,6 +1276,17 @@ typedef struct GPBFileOptions_Storage {
         .typeSpecific.className = NULL,
         .fieldOptions = NULL,
       },
+      {
+        .name = "csharpNamespace",
+        .number = GPBFileOptions_FieldNumber_CsharpNamespace,
+        .hasIndex = 13,
+        .flags = GPBFieldOptional,
+        .type = GPBTypeString,
+        .offset = offsetof(GPBFileOptions_Storage, csharpNamespace),
+        .defaultValue.valueString = nil,
+        .typeSpecific.className = NULL,
+        .fieldOptions = NULL,
+      },
       {
         .name = "uninterpretedOptionArray",
         .number = GPBFileOptions_FieldNumber_UninterpretedOptionArray,
-- 
cgit v1.2.3