From 1dcc329427fd103a0abd96ab787270f5d0a31861 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Thu, 21 May 2015 17:14:52 -0400 Subject: Objective C Second Alpha Drop - Style fixups in the code. - map<> serialization fixes and more tests. - Autocreation of map<> fields (to match repeated fields). - @@protoc_insertion_point(global_scope|imports). - Fixup proto2 syntax extension support. - Move all startup code to +initialize so it happen on class usage and not app startup. - Have generated headers use forward declarations and move imports into generated code, reduces what is need at compile time to speed up compiled and avoid pointless rippling of rebuilds. --- objectivec/Tests/unittest_runtime_proto3.proto | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'objectivec/Tests/unittest_runtime_proto3.proto') diff --git a/objectivec/Tests/unittest_runtime_proto3.proto b/objectivec/Tests/unittest_runtime_proto3.proto index b6a2f4dc..feb7029d 100644 --- a/objectivec/Tests/unittest_runtime_proto3.proto +++ b/objectivec/Tests/unittest_runtime_proto3.proto @@ -98,4 +98,25 @@ message Message3 { Message3 oneof_message = 68; Enum oneof_enum = 69; } + + // Some token map cases, too many combinations to list them all. + map map_int32_int32 = 70; + map map_int64_int64 = 71; + map map_uint32_uint32 = 72; + map map_uint64_uint64 = 73; + map map_sint32_sint32 = 74; + map map_sint64_sint64 = 75; + map map_fixed32_fixed32 = 76; + map map_fixed64_fixed64 = 77; + map map_sfixed32_sfixed32 = 78; + map map_sfixed64_sfixed64 = 79; + map map_int32_float = 80; + map map_int32_double = 81; + map map_bool_bool = 82; + map map_string_string = 83; + map map_string_bytes = 84; + map map_string_message = 85; + map map_int32_bytes = 86; + map map_int32_enum = 87; + map map_int32_message = 88; } -- cgit v1.2.3