diff options
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs')
-rw-r--r-- | csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs | 3 |
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; |