diff options
author | Jon Skeet <jonskeet@google.com> | 2015-06-25 12:08:55 +0100 |
---|---|---|
committer | Jon Skeet <jonskeet@google.com> | 2015-06-25 12:08:55 +0100 |
commit | 3e7d70cb699e93a485ef11fce034f4767aac4b8f (patch) | |
tree | 2a55c0786724988a72bd8f2d3001428b53b334ca /csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs | |
parent | df44ae4413109a7c3ce9f27fb7ae02f0414c29d9 (diff) | |
download | protobuf-3e7d70cb699e93a485ef11fce034f4767aac4b8f.tar.gz protobuf-3e7d70cb699e93a485ef11fce034f4767aac4b8f.tar.bz2 protobuf-3e7d70cb699e93a485ef11fce034f4767aac4b8f.zip |
Generated code changes due to map changes.
(Primarily this is starting the hash code of messages at a non-zero value...)
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs')
-rw-r--r-- | csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs index 28508a3b..280e71c6 100644 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs @@ -168,7 +168,7 @@ namespace UnitTest.Issues.TestProtos { } public override int GetHashCode() { - int hash = 0; + int hash = 17; if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) hash ^= Value.GetHashCode(); hash ^= values_.GetHashCode(); hash ^= packedValues_.GetHashCode(); @@ -212,6 +212,7 @@ namespace UnitTest.Issues.TestProtos { } return size; } + public void MergeFrom(NegativeEnumMessage other) { if (other == null) { return; @@ -303,7 +304,7 @@ namespace UnitTest.Issues.TestProtos { } public override int GetHashCode() { - int hash = 0; + int hash = 17; return hash; } @@ -314,6 +315,7 @@ namespace UnitTest.Issues.TestProtos { int size = 0; return size; } + public void MergeFrom(DeprecatedChild other) { if (other == null) { return; @@ -456,7 +458,7 @@ namespace UnitTest.Issues.TestProtos { } public override int GetHashCode() { - int hash = 0; + int hash = 17; if (PrimitiveValue != 0) hash ^= PrimitiveValue.GetHashCode(); hash ^= primitiveArray_.GetHashCode(); if (messageValue_ != null) hash ^= MessageValue.GetHashCode(); @@ -527,6 +529,7 @@ namespace UnitTest.Issues.TestProtos { } return size; } + public void MergeFrom(DeprecatedFieldsMessage other) { if (other == null) { return; @@ -655,7 +658,7 @@ namespace UnitTest.Issues.TestProtos { } public override int GetHashCode() { - int hash = 0; + int hash = 17; if (Item != 0) hash ^= Item.GetHashCode(); return hash; } @@ -674,6 +677,7 @@ namespace UnitTest.Issues.TestProtos { } return size; } + public void MergeFrom(ItemField other) { if (other == null) { return; |