diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2015-06-09 17:17:45 -0700 |
---|---|---|
committer | Paul Yang <TeBoring@users.noreply.github.com> | 2015-06-09 17:17:45 -0700 |
commit | fb466c13a7c0280fdc30acf86d3b29235a904ba5 (patch) | |
tree | 938c7b2e06268887d766a4ac03d24fcb89f21ef8 /objectivec/GPBProtocolBuffers.m | |
parent | fd73235f6b2534aa63af41359d9f386ade43a5cc (diff) | |
parent | d846b0b059b4d867536b98aa29475a387aa09114 (diff) | |
download | protobuf-fb466c13a7c0280fdc30acf86d3b29235a904ba5.tar.gz protobuf-fb466c13a7c0280fdc30acf86d3b29235a904ba5.tar.bz2 protobuf-fb466c13a7c0280fdc30acf86d3b29235a904ba5.zip |
Merge pull request #480 from thomasvl/objc_beta_drop
Beta quality drop of Objective C Support.
Diffstat (limited to 'objectivec/GPBProtocolBuffers.m')
-rw-r--r-- | objectivec/GPBProtocolBuffers.m | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/objectivec/GPBProtocolBuffers.m b/objectivec/GPBProtocolBuffers.m index 96eeb1d3..e9cbfb42 100644 --- a/objectivec/GPBProtocolBuffers.m +++ b/objectivec/GPBProtocolBuffers.m @@ -36,14 +36,27 @@ #import "GPBCodedOutputStream.m" #import "GPBDescriptor.m" #import "GPBDictionary.m" -#import "GPBExtensionField.m" +#import "GPBExtensionInternals.m" #import "GPBExtensionRegistry.m" -#import "GPBField.m" #import "GPBMessage.m" #import "GPBRootObject.m" +#import "GPBUnknownField.m" #import "GPBUnknownFieldSet.m" #import "GPBUtilities.m" #import "GPBWellKnownTypes.m" #import "GPBWireFormat.m" #import "google/protobuf/Descriptor.pbobjc.m" + +// Duration and Timestamp are #imported into GPBWellKnownTypes.m to the +// Objective C categories added will always be linked in with the classes. +#import "google/protobuf/Any.pbobjc.m" +#import "google/protobuf/Api.pbobjc.m" +// #import "google/protobuf/Duration.pbobjc.m" +#import "google/protobuf/Empty.pbobjc.m" +#import "google/protobuf/FieldMask.pbobjc.m" +#import "google/protobuf/SourceContext.pbobjc.m" +#import "google/protobuf/Struct.pbobjc.m" +// #import "google/protobuf/Timestamp.pbobjc.m" +#import "google/protobuf/Type.pbobjc.m" +#import "google/protobuf/Wrappers.pbobjc.m" |