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_proto2.proto | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'objectivec/Tests/unittest_runtime_proto2.proto') diff --git a/objectivec/Tests/unittest_runtime_proto2.proto b/objectivec/Tests/unittest_runtime_proto2.proto index 12a2da68..ed835020 100644 --- a/objectivec/Tests/unittest_runtime_proto2.proto +++ b/objectivec/Tests/unittest_runtime_proto2.proto @@ -78,9 +78,8 @@ message Message2 { repeated group RepeatedGroup = 46 { optional int32 a = 47; } - repeated Message2 repeated_message = 48; - repeated Enum repeated_enum = 49; - repeated Enum repeated_packed_enum = 50 [packed=true]; + repeated Message2 repeated_message = 48; + repeated Enum repeated_enum = 49; oneof o { int32 oneof_int32 = 51 [default = 100]; -- cgit v1.2.3