aboutsummaryrefslogtreecommitdiffhomepage
path: root/objectivec/GPBUtilities.h
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2015-06-16 16:45:14 -0400
committerGravatar Thomas Van Lenten <thomasvl@google.com>2015-06-16 17:04:50 -0400
commit8c88957ef375f3b739b6e72ea5c2fb71b12e1fc2 (patch)
tree31b4561aae2a11b1a9b4b7010dc9df10c52a4d72 /objectivec/GPBUtilities.h
parent4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff)
Add nonnil markup to ObjC library.
Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
Diffstat (limited to 'objectivec/GPBUtilities.h')
-rw-r--r--objectivec/GPBUtilities.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/objectivec/GPBUtilities.h b/objectivec/GPBUtilities.h
index 87cd32c7..1301b436 100644
--- a/objectivec/GPBUtilities.h
+++ b/objectivec/GPBUtilities.h
@@ -36,13 +36,16 @@
CF_EXTERN_C_BEGIN
+NS_ASSUME_NONNULL_BEGIN
+
// Generates a string that should be a valid "Text Format" for the C++ version
// of Protocol Buffers. lineIndent can be nil if no additional line indent is
// needed. The comments provide the names according to the ObjC library, they
// most likely won't exactly match the original .proto file.
-NSString *GPBTextFormatForMessage(GPBMessage *message, NSString *lineIndent);
+NSString *GPBTextFormatForMessage(GPBMessage *message,
+ NSString * __nullable lineIndent);
NSString *GPBTextFormatForUnknownFieldSet(GPBUnknownFieldSet *unknownSet,
- NSString *lineIndent);
+ NSString * __nullable lineIndent);
//
// Test if the given field is set on a message.
@@ -128,6 +131,8 @@ void GPBSetMessageMapField(GPBMessage *self, GPBFieldDescriptor *field, id dicti
// objects.
NSData *GPBEmptyNSData(void) __attribute__((pure));
+NS_ASSUME_NONNULL_END
+
CF_EXTERN_C_END