aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
diff options
context:
space:
mode:
authorJon Skeet <jonskeet@google.com>2015-06-25 12:08:55 +0100
committerJon Skeet <jonskeet@google.com>2015-06-25 12:08:55 +0100
commit3e7d70cb699e93a485ef11fce034f4767aac4b8f (patch)
tree2a55c0786724988a72bd8f2d3001428b53b334ca /csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
parentdf44ae4413109a7c3ce9f27fb7ae02f0414c29d9 (diff)
downloadprotobuf-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/UnittestImportPublicProto3.cs')
-rw-r--r--csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
index 2c8b0a31..a922bfac 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
@@ -105,7 +105,7 @@ namespace Google.Protobuf.TestProtos {
}
public override int GetHashCode() {
- int hash = 0;
+ int hash = 17;
if (E != 0) hash ^= E.GetHashCode();
return hash;
}
@@ -124,6 +124,7 @@ namespace Google.Protobuf.TestProtos {
}
return size;
}
+
public void MergeFrom(PublicImportMessage other) {
if (other == null) {
return;