diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2018-01-23 13:38:28 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2018-01-25 12:18:39 -0500 |
| commit | 3e1587fd4bcfaa447aa5fb43198f4f8709c673e4 (patch) | |
| tree | f571c57d9196fa2e2768fdb1843e9e7cc66e0727 /objectivec | |
| parent | 6fd2ae7e45584493446b5afe13e8e998e6c9338c (diff) | |
Add an explicit import of stdatomic.h.
The generated code for enums needs atomics support, so generate the
import instead of relying on it via transitive imports. This will
make future changes to this likely likely to break generated code
and runtime support are mixed.
Followup to https://github.com/google/protobuf/pull/4184.
Diffstat (limited to 'objectivec')
| -rw-r--r-- | objectivec/GPBMessage_PackagePrivate.h | 2 | ||||
| -rw-r--r-- | objectivec/google/protobuf/Struct.pbobjc.m | 2 | ||||
| -rw-r--r-- | objectivec/google/protobuf/Type.pbobjc.m | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/objectivec/GPBMessage_PackagePrivate.h b/objectivec/GPBMessage_PackagePrivate.h index 820bb7b4..366e5bbf 100644 --- a/objectivec/GPBMessage_PackagePrivate.h +++ b/objectivec/GPBMessage_PackagePrivate.h @@ -34,8 +34,6 @@ #import "GPBMessage.h" -#import <stdatomic.h> - // TODO: Remove this import. Older generated code use the OSAtomic* apis, // so anyone that hasn't regenerated says building by having this. After // enough time has passed, this likely can be removed as folks should have diff --git a/objectivec/google/protobuf/Struct.pbobjc.m b/objectivec/google/protobuf/Struct.pbobjc.m index dff2f844..6d9d7b75 100644 --- a/objectivec/google/protobuf/Struct.pbobjc.m +++ b/objectivec/google/protobuf/Struct.pbobjc.m @@ -13,6 +13,8 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #endif +#import <stdatomic.h> + #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import <Protobuf/Struct.pbobjc.h> #else diff --git a/objectivec/google/protobuf/Type.pbobjc.m b/objectivec/google/protobuf/Type.pbobjc.m index 06795308..981ae4d4 100644 --- a/objectivec/google/protobuf/Type.pbobjc.m +++ b/objectivec/google/protobuf/Type.pbobjc.m @@ -13,6 +13,8 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #endif +#import <stdatomic.h> + #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import <Protobuf/Type.pbobjc.h> #import <Protobuf/Any.pbobjc.h> |