diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
| commit | a15b916c419000565384a78224e402ed925e5fc8 (patch) | |
| tree | d0bd6aa4648fddbb08d35d8b78dba32958ae7b51 /objectivec/GPBRuntimeTypes.h | |
| parent | 67c727cd411a339eb4233c84d9a1afadd8c20566 (diff) | |
| parent | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff) | |
| download | protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.gz protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.bz2 protobuf-a15b916c419000565384a78224e402ed925e5fc8.zip | |
Merge branch 'master' into docker
Diffstat (limited to 'objectivec/GPBRuntimeTypes.h')
| -rw-r--r-- | objectivec/GPBRuntimeTypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/GPBRuntimeTypes.h b/objectivec/GPBRuntimeTypes.h index e91d86a6..0a38b110 100644 --- a/objectivec/GPBRuntimeTypes.h +++ b/objectivec/GPBRuntimeTypes.h @@ -67,7 +67,7 @@ typedef union { // Do not change the order of this enum (or add things to it) without thinking // about it very carefully. There are several things that depend on the order. -typedef enum { +typedef NS_ENUM(uint8_t, GPBDataType) { GPBDataTypeBool = 0, GPBDataTypeFixed32, GPBDataTypeSFixed32, @@ -86,7 +86,7 @@ typedef enum { GPBDataTypeMessage, GPBDataTypeGroup, GPBDataTypeEnum, -} GPBDataType; +}; enum { // A count of the number of types in GPBDataType. Separated out from the |