diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2015-05-21 17:14:52 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-05-22 14:27:31 -0400 |
| commit | 1dcc329427fd103a0abd96ab787270f5d0a31861 (patch) | |
| tree | cf1c52df0e1effa3d0985a3406a71c38c3a4e487 /objectivec/GPBBootstrap.h | |
| parent | c3480926f98eb7c45224daae5cf0373e120b3b8d (diff) | |
| download | protobuf-1dcc329427fd103a0abd96ab787270f5d0a31861.tar.gz protobuf-1dcc329427fd103a0abd96ab787270f5d0a31861.tar.bz2 protobuf-1dcc329427fd103a0abd96ab787270f5d0a31861.zip | |
Objective C Second Alpha Drop
- Style fixups in the code.
- map<> serialization fixes and more tests.
- Autocreation of map<> fields (to match repeated fields).
- @@protoc_insertion_point(global_scope|imports).
- Fixup proto2 syntax extension support.
- Move all startup code to +initialize so it happen on class usage and not app startup.
- Have generated headers use forward declarations and move imports into generated code, reduces what is need at compile time to speed up compiled and avoid pointless rippling of rebuilds.
Diffstat (limited to 'objectivec/GPBBootstrap.h')
| -rw-r--r-- | objectivec/GPBBootstrap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/objectivec/GPBBootstrap.h b/objectivec/GPBBootstrap.h index 530eb5cb..3dd2de83 100644 --- a/objectivec/GPBBootstrap.h +++ b/objectivec/GPBBootstrap.h @@ -51,11 +51,11 @@ // the Swift bridge will have one where the names line up to support short // names since they are scoped to the enum. // https://developer.apple.com/library/ios/documentation/Swift/Conceptual/BuildingCocoaApps/InteractingWithCAPIs.html#//apple_ref/doc/uid/TP40014216-CH8-XID_11 -#define GPB_ENUM(X) enum X##_ : int32_t X; typedef NS_ENUM(int32_t, X##_) -// GPB_ENUM_FWD_DECLARE is used for forward declaring enums ex: +#define GPB_ENUM(X) NS_ENUM(int32_t, X) +// GPB_ENUM_FWD_DECLARE is used for forward declaring enums, ex: // GPB_ENUM_FWD_DECLARE(Foo_Enum) // @property (nonatomic) Foo_Enum value; -#define GPB_ENUM_FWD_DECLARE(_name) enum _name : int32_t +#define GPB_ENUM_FWD_DECLARE(X) enum X : int32_t // Based upon CF_INLINE. Forces inlining in release. #if !defined(DEBUG) |