diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2015-05-21 17:14:52 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-05-22 14:27:31 -0400 |
| commit | 1dcc329427fd103a0abd96ab787270f5d0a31861 (patch) | |
| tree | cf1c52df0e1effa3d0985a3406a71c38c3a4e487 /objectivec/Tests/unittest_runtime_proto3.proto | |
| parent | c3480926f98eb7c45224daae5cf0373e120b3b8d (diff) | |
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.
Diffstat (limited to 'objectivec/Tests/unittest_runtime_proto3.proto')
| -rw-r--r-- | objectivec/Tests/unittest_runtime_proto3.proto | 21 |
1 files changed, 21 insertions, 0 deletions
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<int32 , int32 > map_int32_int32 = 70; + map<int64 , int64 > map_int64_int64 = 71; + map<uint32 , uint32 > map_uint32_uint32 = 72; + map<uint64 , uint64 > map_uint64_uint64 = 73; + map<sint32 , sint32 > map_sint32_sint32 = 74; + map<sint64 , sint64 > map_sint64_sint64 = 75; + map<fixed32 , fixed32 > map_fixed32_fixed32 = 76; + map<fixed64 , fixed64 > map_fixed64_fixed64 = 77; + map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 78; + map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 79; + map<int32 , float > map_int32_float = 80; + map<int32 , double > map_int32_double = 81; + map<bool , bool > map_bool_bool = 82; + map<string , string > map_string_string = 83; + map<string , bytes > map_string_bytes = 84; + map<string , Message3> map_string_message = 85; + map<int32 , bytes > map_int32_bytes = 86; + map<int32 , Enum > map_int32_enum = 87; + map<int32 , Message3> map_int32_message = 88; } |