diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-06-26 10:32:23 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-06-26 10:32:23 +0100 |
| commit | c12833104f43118d62f73ae9a82cfc7ba50a04b4 (patch) | |
| tree | 1bd9c87f4295c7df827e57eefa7f2cc118055f3d /src/google/protobuf/compiler/csharp/csharp_message.cc | |
| parent | c06226354d89e53c96f69401539ef3208ba4ab44 (diff) | |
| download | protobuf-c12833104f43118d62f73ae9a82cfc7ba50a04b4.tar.gz protobuf-c12833104f43118d62f73ae9a82cfc7ba50a04b4.tar.bz2 protobuf-c12833104f43118d62f73ae9a82cfc7ba50a04b4.zip | |
Tweaks and more tests for maps
- Change the default message hash code to 1 to be consistent with other code
- Change the empty list/map hash code to 0 as "empty map" is equivalent to "no map"
- Removed map fields from unittest_proto3.proto
- Created map_unittest_proto3.proto which is like map_unittest.proto but proto3-only
- Fixed factory methods in FieldCodec highlighted by using all field types :)
- Added tests for map serialization:
- Extra fields within entries
- Entries with value then key
- Non-contiguous entries for the same map
- Multiple entries for the same key
Changes to generated code coming in next commit
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_message.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc index 9e055f64..9e2fe9b6 100644 --- a/src/google/protobuf/compiler/csharp/csharp_message.cc +++ b/src/google/protobuf/compiler/csharp/csharp_message.cc @@ -408,7 +408,7 @@ void MessageGenerator::GenerateFrameworkMethods(io::Printer* printer) { // Start with a non-zero value to easily distinguish between null and "empty" messages. printer->Print( "public override int GetHashCode() {\n" - " int hash = 17;\n"); + " int hash = 1;\n"); printer->Indent(); for (int i = 0; i < descriptor_->field_count(); i++) { scoped_ptr<FieldGeneratorBase> generator( |