Open GoogleCodeExporter opened 9 years ago
Purpose of code changes on this branch: Get protobuf happily compiling with LLVM 3.0 After the review, I'll merge this branch into: /trunk Diff: Index: protobuf-2.2.0/objectivec/Classes/ConcreteExtensionField.m =================================================================== --- protobuf-2.2.0/objectivec/Classes/ConcreteExtensionField.m (revision 4426) +++ protobuf-2.2.0/objectivec/Classes/ConcreteExtensionField.m (working copy) @@ -16,10 +16,10 @@ @interface PBConcreteExtensionField() @property PBExtensionType type; -@property Class extendedClass; +@property (assign) Class extendedClass; @property int32_t fieldNumber; @property (retain) id defaultValue; -@property Class messageOrGroupClass; +@property (assign) Class messageOrGroupClass; @property BOOL isRepeated; @property BOOL isPacked; @property BOOL isMessageSetWireFormat; @@ -149,9 +149,9 @@ case PBExtensionTypeSFixed64: case PBExtensionTypeDouble: return 8; + default: + @throw [NSException exceptionWithName:@"InternalError" reason:@"" userInfo:nil]; } - - @throw [NSException exceptionWithName:@"InternalError" reason:@"" userInfo:nil]; } @@ -490,14 +490,14 @@ case PBExtensionTypeEnum: return [NSNumber numberWithInt:[input readEnum]]; case PBExtensionTypeGroup: { - id<PBMessage_Builder> builder = [messageOrGroupClass builder]; + id<PBMessage_Builder> builder = (id<PBMessage_Builder>)[messageOrGroupClass builder]; [input readGroup:fieldNumber builder:builder extensionRegistry:extensionRegistry]; return [builder build]; } case PBExtensionTypeMessage: { - id<PBMessage_Builder> builder = [messageOrGroupClass builder]; + id<PBMessage_Builder> builder = (id<PBMessage_Builder>)[messageOrGroupClass builder]; [input readMessage:builder extensionRegistry:extensionRegistry]; return [builder build]; }
Original issue reported on code.google.com by dmaclach on 8 Sep 2011 at 3:32
dmaclach
Cheers for that - I had made the modification myself and came looking on here to suggest a patch!
Original comment by b...@dotbill.co.uk on 5 Oct 2011 at 1:25
b...@dotbill.co.uk
Original issue reported on code.google.com by
dmaclach
on 8 Sep 2011 at 3:32