diff options
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs')
-rw-r--r-- | csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs index a32d19c2..939be74a 100644 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs @@ -120,7 +120,7 @@ namespace Google.Protobuf.TestProtos { } public override int GetHashCode() { - int hash = 0; + int hash = 1; if (D != 0) hash ^= D.GetHashCode(); return hash; } @@ -139,6 +139,7 @@ namespace Google.Protobuf.TestProtos { } return size; } + public void MergeFrom(ImportMessage other) { if (other == null) { return; |