Regenerated code with changes

1 files changed, 76 insertions, 60 deletions

diff --git a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
index 0d9109a2..375e8888 100644
--- a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
+++ b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
@@ -125,7 +125,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpFileOptions : pb::GeneratedMessage<CSharpFileOptions, CSharpFileOptions.Builder> {

-    private static readonly CSharpFileOptions defaultInstance = new Builder().BuildPartial();

+    private static readonly CSharpFileOptions defaultInstance = new CSharpFileOptions().MakeReadOnly();

     private static readonly string[] _cSharpFileOptionsFieldNames = new string[] { "cls_compliance", "code_contracts", "expand_namespace_directories", "file_extension", "ignore_google_protobuf", "multiple_files", "namespace", "nest_classes", "output_directory", "public_classes", "service_generator_type", "umbrella_classname", "umbrella_namespace" };

     private static readonly uint[] _cSharpFileOptionsFieldTags = new uint[] { 64, 48, 56, 1770, 1792, 32, 10, 40, 1786, 24, 1800, 18, 1778 };

     public static CSharpFileOptions DefaultInstance {

@@ -133,7 +133,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     public override CSharpFileOptions DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override CSharpFileOptions ThisMessage {

@@ -411,6 +411,10 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     public static CSharpFileOptions ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private CSharpFileOptions MakeReadOnly() {

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -426,22 +430,22 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new CSharpFileOptions();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(CSharpFileOptions cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      CSharpFileOptions result;

+      private bool resultIsReadOnly;

+      private CSharpFileOptions result;

       

       private CSharpFileOptions PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           CSharpFileOptions original = result;

           result = new CSharpFileOptions();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -456,13 +460,13 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new CSharpFileOptions();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -478,11 +482,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override CSharpFileOptions BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {

@@ -923,7 +927,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpFieldOptions : pb::GeneratedMessage<CSharpFieldOptions, CSharpFieldOptions.Builder> {

-    private static readonly CSharpFieldOptions defaultInstance = new Builder().BuildPartial();

+    private static readonly CSharpFieldOptions defaultInstance = new CSharpFieldOptions().MakeReadOnly();

     private static readonly string[] _cSharpFieldOptionsFieldNames = new string[] { "property_name" };

     private static readonly uint[] _cSharpFieldOptionsFieldTags = new uint[] { 10 };

     public static CSharpFieldOptions DefaultInstance {

@@ -931,7 +935,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     public override CSharpFieldOptions DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override CSharpFieldOptions ThisMessage {

@@ -1017,6 +1021,10 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     public static CSharpFieldOptions ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private CSharpFieldOptions MakeReadOnly() {

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -1032,22 +1040,22 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new CSharpFieldOptions();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(CSharpFieldOptions cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      CSharpFieldOptions result;

+      private bool resultIsReadOnly;

+      private CSharpFieldOptions result;

       

       private CSharpFieldOptions PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           CSharpFieldOptions original = result;

           result = new CSharpFieldOptions();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -1062,13 +1070,13 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new CSharpFieldOptions();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -1084,11 +1092,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override CSharpFieldOptions BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {

@@ -1193,7 +1201,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpServiceOptions : pb::GeneratedMessage<CSharpServiceOptions, CSharpServiceOptions.Builder> {

-    private static readonly CSharpServiceOptions defaultInstance = new Builder().BuildPartial();

+    private static readonly CSharpServiceOptions defaultInstance = new CSharpServiceOptions().MakeReadOnly();

     private static readonly string[] _cSharpServiceOptionsFieldNames = new string[] { "interface_id" };

     private static readonly uint[] _cSharpServiceOptionsFieldTags = new uint[] { 10 };

     public static CSharpServiceOptions DefaultInstance {

@@ -1201,7 +1209,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     public override CSharpServiceOptions DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override CSharpServiceOptions ThisMessage {

@@ -1287,6 +1295,10 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     public static CSharpServiceOptions ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private CSharpServiceOptions MakeReadOnly() {

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -1302,22 +1314,22 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new CSharpServiceOptions();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(CSharpServiceOptions cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      CSharpServiceOptions result;

+      private bool resultIsReadOnly;

+      private CSharpServiceOptions result;

       

       private CSharpServiceOptions PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           CSharpServiceOptions original = result;

           result = new CSharpServiceOptions();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -1332,13 +1344,13 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new CSharpServiceOptions();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -1354,11 +1366,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override CSharpServiceOptions BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {

@@ -1463,7 +1475,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpMethodOptions : pb::GeneratedMessage<CSharpMethodOptions, CSharpMethodOptions.Builder> {

-    private static readonly CSharpMethodOptions defaultInstance = new Builder().BuildPartial();

+    private static readonly CSharpMethodOptions defaultInstance = new CSharpMethodOptions().MakeReadOnly();

     private static readonly string[] _cSharpMethodOptionsFieldNames = new string[] { "dispatch_id" };

     private static readonly uint[] _cSharpMethodOptionsFieldTags = new uint[] { 8 };

     public static CSharpMethodOptions DefaultInstance {

@@ -1471,7 +1483,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     public override CSharpMethodOptions DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override CSharpMethodOptions ThisMessage {

@@ -1557,6 +1569,10 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     public static CSharpMethodOptions ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private CSharpMethodOptions MakeReadOnly() {

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -1572,22 +1588,22 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new CSharpMethodOptions();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(CSharpMethodOptions cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      CSharpMethodOptions result;

+      private bool resultIsReadOnly;

+      private CSharpMethodOptions result;

       

       private CSharpMethodOptions PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           CSharpMethodOptions original = result;

           result = new CSharpMethodOptions();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -1602,13 +1618,13 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new CSharpMethodOptions();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -1624,11 +1640,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }

       

       public override CSharpMethodOptions BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {