From 3e7d70cb699e93a485ef11fce034f4767aac4b8f Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Thu, 25 Jun 2015 12:08:55 +0100
Subject: Generated code changes due to map changes. (Primarily this is
 starting the hash code of messages at a non-zero value...)

---
 .../DescriptorProtos/DescriptorProtoFile.cs        | 66 ++++++++++++++--------
 1 file changed, 44 insertions(+), 22 deletions(-)

(limited to 'csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs')

diff --git a/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
index eedb21fe..d1156fec 100644
--- a/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
+++ b/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
@@ -335,7 +335,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       hash ^= file_.GetHashCode();
       return hash;
     }
@@ -356,6 +356,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(FileDescriptorSet other) {
       if (other == null) {
         return;
@@ -558,7 +559,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       if (Package.Length != 0) hash ^= Package.GetHashCode();
       hash ^= dependency_.GetHashCode();
@@ -685,6 +686,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(FileDescriptorProto other) {
       if (other == null) {
         return;
@@ -938,7 +940,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       hash ^= field_.GetHashCode();
       hash ^= extension_.GetHashCode();
@@ -1047,6 +1049,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(DescriptorProto other) {
       if (other == null) {
         return;
@@ -1204,7 +1207,7 @@ namespace Google.Protobuf.DescriptorProtos {
         }
 
         public override int GetHashCode() {
-          int hash = 0;
+          int hash = 17;
           if (Start != 0) hash ^= Start.GetHashCode();
           if (End != 0) hash ^= End.GetHashCode();
           return hash;
@@ -1231,6 +1234,7 @@ namespace Google.Protobuf.DescriptorProtos {
           }
           return size;
         }
+
         public void MergeFrom(ExtensionRange other) {
           if (other == null) {
             return;
@@ -1341,7 +1345,7 @@ namespace Google.Protobuf.DescriptorProtos {
         }
 
         public override int GetHashCode() {
-          int hash = 0;
+          int hash = 17;
           if (Start != 0) hash ^= Start.GetHashCode();
           if (End != 0) hash ^= End.GetHashCode();
           return hash;
@@ -1368,6 +1372,7 @@ namespace Google.Protobuf.DescriptorProtos {
           }
           return size;
         }
+
         public void MergeFrom(ReservedRange other) {
           if (other == null) {
             return;
@@ -1568,7 +1573,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       if (Number != 0) hash ^= Number.GetHashCode();
       if (Label != global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL) hash ^= Label.GetHashCode();
@@ -1651,6 +1656,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(FieldDescriptorProto other) {
       if (other == null) {
         return;
@@ -1837,7 +1843,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       return hash;
     }
@@ -1856,6 +1862,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(OneofDescriptorProto other) {
       if (other == null) {
         return;
@@ -1969,7 +1976,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       hash ^= value_.GetHashCode();
       if (options_ != null) hash ^= Options.GetHashCode();
@@ -2006,6 +2013,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(EnumDescriptorProto other) {
       if (other == null) {
         return;
@@ -2140,7 +2148,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       if (Number != 0) hash ^= Number.GetHashCode();
       if (options_ != null) hash ^= Options.GetHashCode();
@@ -2175,6 +2183,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(EnumValueDescriptorProto other) {
       if (other == null) {
         return;
@@ -2308,7 +2317,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       hash ^= method_.GetHashCode();
       if (options_ != null) hash ^= Options.GetHashCode();
@@ -2345,6 +2354,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(ServiceDescriptorProto other) {
       if (other == null) {
         return;
@@ -2515,7 +2525,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       if (InputType.Length != 0) hash ^= InputType.GetHashCode();
       if (OutputType.Length != 0) hash ^= OutputType.GetHashCode();
@@ -2574,6 +2584,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(MethodDescriptorProto other) {
       if (other == null) {
         return;
@@ -2871,7 +2882,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (JavaPackage.Length != 0) hash ^= JavaPackage.GetHashCode();
       if (JavaOuterClassname.Length != 0) hash ^= JavaOuterClassname.GetHashCode();
       if (JavaMultipleFiles != false) hash ^= JavaMultipleFiles.GetHashCode();
@@ -3004,6 +3015,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(FileOptions other) {
       if (other == null) {
         return;
@@ -3248,7 +3260,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (MessageSetWireFormat != false) hash ^= MessageSetWireFormat.GetHashCode();
       if (NoStandardDescriptorAccessor != false) hash ^= NoStandardDescriptorAccessor.GetHashCode();
       if (Deprecated != false) hash ^= Deprecated.GetHashCode();
@@ -3301,6 +3313,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(MessageOptions other) {
       if (other == null) {
         return;
@@ -3487,7 +3500,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Ctype != global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.CType.STRING) hash ^= Ctype.GetHashCode();
       if (Packed != false) hash ^= Packed.GetHashCode();
       if (Jstype != global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.JSType.JS_NORMAL) hash ^= Jstype.GetHashCode();
@@ -3556,6 +3569,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(FieldOptions other) {
       if (other == null) {
         return;
@@ -3726,7 +3740,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (AllowAlias != false) hash ^= AllowAlias.GetHashCode();
       if (Deprecated != false) hash ^= Deprecated.GetHashCode();
       hash ^= uninterpretedOption_.GetHashCode();
@@ -3763,6 +3777,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(EnumOptions other) {
       if (other == null) {
         return;
@@ -3875,7 +3890,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Deprecated != false) hash ^= Deprecated.GetHashCode();
       hash ^= uninterpretedOption_.GetHashCode();
       return hash;
@@ -3904,6 +3919,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(EnumValueOptions other) {
       if (other == null) {
         return;
@@ -4009,7 +4025,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Deprecated != false) hash ^= Deprecated.GetHashCode();
       hash ^= uninterpretedOption_.GetHashCode();
       return hash;
@@ -4038,6 +4054,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(ServiceOptions other) {
       if (other == null) {
         return;
@@ -4143,7 +4160,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       if (Deprecated != false) hash ^= Deprecated.GetHashCode();
       hash ^= uninterpretedOption_.GetHashCode();
       return hash;
@@ -4172,6 +4189,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(MethodOptions other) {
       if (other == null) {
         return;
@@ -4337,7 +4355,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       hash ^= name_.GetHashCode();
       if (IdentifierValue.Length != 0) hash ^= IdentifierValue.GetHashCode();
       if (PositiveIntValue != 0UL) hash ^= PositiveIntValue.GetHashCode();
@@ -4406,6 +4424,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(UninterpretedOption other) {
       if (other == null) {
         return;
@@ -4550,7 +4569,7 @@ namespace Google.Protobuf.DescriptorProtos {
         }
 
         public override int GetHashCode() {
-          int hash = 0;
+          int hash = 17;
           if (NamePart_.Length != 0) hash ^= NamePart_.GetHashCode();
           if (IsExtension != false) hash ^= IsExtension.GetHashCode();
           return hash;
@@ -4577,6 +4596,7 @@ namespace Google.Protobuf.DescriptorProtos {
           }
           return size;
         }
+
         public void MergeFrom(NamePart other) {
           if (other == null) {
             return;
@@ -4677,7 +4697,7 @@ namespace Google.Protobuf.DescriptorProtos {
     }
 
     public override int GetHashCode() {
-      int hash = 0;
+      int hash = 17;
       hash ^= location_.GetHashCode();
       return hash;
     }
@@ -4698,6 +4718,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
       return size;
     }
+
     public void MergeFrom(SourceCodeInfo other) {
       if (other == null) {
         return;
@@ -4827,7 +4848,7 @@ namespace Google.Protobuf.DescriptorProtos {
         }
 
         public override int GetHashCode() {
-          int hash = 0;
+          int hash = 17;
           hash ^= path_.GetHashCode();
           hash ^= span_.GetHashCode();
           if (LeadingComments.Length != 0) hash ^= LeadingComments.GetHashCode();
@@ -4892,6 +4913,7 @@ namespace Google.Protobuf.DescriptorProtos {
           }
           return size;
         }
+
         public void MergeFrom(Location other) {
           if (other == null) {
             return;
-- 
cgit v1.2.3