aboutsummaryrefslogtreecommitdiff
path: root/objectivec/Tests/unittest_runtime_proto2.proto
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2015-05-26 12:31:13 -0400
committerThomas Van Lenten <thomasvl@google.com>2015-05-26 14:01:54 -0400
commit58cd4a47e823645414348acbd8f963f7e713b2fa (patch)
treeafeed28fdefcdad822152af40adac664cf67f0ff /objectivec/Tests/unittest_runtime_proto2.proto
parent8e1426800e8332bcdfa9f29eb0db41d3a565b598 (diff)
downloadprotobuf-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_proto2.proto')
-rw-r--r--objectivec/Tests/unittest_runtime_proto2.proto5
1 files changed, 2 insertions, 3 deletions
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];