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/GPBUtilities_PackagePrivate.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/GPBUtilities_PackagePrivate.h')
| -rw-r--r-- | objectivec/GPBUtilities_PackagePrivate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/objectivec/GPBUtilities_PackagePrivate.h b/objectivec/GPBUtilities_PackagePrivate.h index cac551f6..a6b6c84d 100644 --- a/objectivec/GPBUtilities_PackagePrivate.h +++ b/objectivec/GPBUtilities_PackagePrivate.h @@ -185,7 +185,7 @@ GPB_INLINE void GPBSetHasIvarField(GPBMessage *self, GPBFieldDescriptor *field, } void GPBMaybeClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof, - uint32_t fieldNumberNotToClear); + int32_t oneofHasIndex, uint32_t fieldNumberNotToClear); //%PDDM-DEFINE GPB_IVAR_SET_DECL(NAME, TYPE) //%void GPBSet##NAME##IvarWithFieldInternal(GPBMessage *self, |