diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2015-05-26 12:31:13 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2015-05-26 14:01:54 -0400 |
commit | 58cd4a47e823645414348acbd8f963f7e713b2fa (patch) | |
tree | afeed28fdefcdad822152af40adac664cf67f0ff /objectivec/Tests/unittest_runtime_proto3.proto | |
parent | 8e1426800e8332bcdfa9f29eb0db41d3a565b598 (diff) | |
download | protobuf-58cd4a47e823645414348acbd8f963f7e713b2fa.tar.gz protobuf-58cd4a47e823645414348acbd8f963f7e713b2fa.tar.bz2 protobuf-58cd4a47e823645414348acbd8f963f7e713b2fa.zip |
ObjC fixup for the branch.
- Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives.
- Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults.
- Move up the ignore to cover .DS_Store files in src also.
add starstar
Diffstat (limited to 'objectivec/Tests/unittest_runtime_proto3.proto')
-rw-r--r-- | objectivec/Tests/unittest_runtime_proto3.proto | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/objectivec/Tests/unittest_runtime_proto3.proto b/objectivec/Tests/unittest_runtime_proto3.proto index a081fa7e..ad2e3620 100644 --- a/objectivec/Tests/unittest_runtime_proto3.proto +++ b/objectivec/Tests/unittest_runtime_proto3.proto @@ -75,11 +75,7 @@ message Message3 { repeated bytes repeated_bytes = 45; // No 'group' in proto3. repeated Message3 repeated_message = 48; - // TODO(teboring): In proto3, repeated primitive field is packed by default. - // testProto2UnknownEnumToUnknownField needs repeated_enum to be unpacked. - // Remove this option when testProto2UnknownEnumToUnknownField. - repeated Enum repeated_enum = 49 [packed=false]; - repeated Enum repeated_packed_enum = 50 [packed=true]; + repeated Enum repeated_enum = 49; oneof o { int32 oneof_int32 = 51; |