From 58cd4a47e823645414348acbd8f963f7e713b2fa Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Tue, 26 May 2015 12:31:13 -0400 Subject: 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 --- objectivec/Tests/unittest_runtime_proto3.proto | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (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 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; -- cgit v1.2.3