Merge pull request Cocoanetics#1273 from cntrump/pr/fix_mixing_objcpp…

…_issue Fix Undefined Symbol When Mixing Objective-C++ Code
duxinfeng · Jul 14, 2023 · 4602af6 · 4602af6
2 parents 35c694c + f75e700
commit 4602af6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/Core/Source/NSAttributedStringRunDelegates.h b/Core/Source/NSAttributedStringRunDelegates.h
@@ -16,8 +16,16 @@
 #import <ApplicationServices/ApplicationServices.h>
 #endif
 
-void embeddedObjectDeallocCallback(void *context);
-CGFloat embeddedObjectGetAscentCallback(void *context);
-CGFloat embeddedObjectGetDescentCallback(void *context);
-CGFloat embeddedObjectGetWidthCallback(void *context);
-CTRunDelegateRef createEmbeddedObjectRunDelegate(id obj);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void embeddedObjectDeallocCallback(void *_Nullable context);
+CGFloat embeddedObjectGetAscentCallback(void *_Nullable context);
+CGFloat embeddedObjectGetDescentCallback(void *_Nullable context);
+CGFloat embeddedObjectGetWidthCallback(void *_Nullable context);
+CTRunDelegateRef _Nullable createEmbeddedObjectRunDelegate(id _Nullable obj);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Core/Source/NSAttributedStringRunDelegates.m b/Core/Source/NSAttributedStringRunDelegates.m
@@ -10,19 +10,19 @@
 #import "DTTextAttachment.h"
 
 
-void embeddedObjectDeallocCallback(void *context)
+void embeddedObjectDeallocCallback(void *_Nullable context)
 {
 }
 
-CGFloat embeddedObjectGetAscentCallback(void *context)
+CGFloat embeddedObjectGetAscentCallback(void *_Nullable context)
 {
 	if ([(__bridge id)context isKindOfClass:[DTTextAttachment class]])
 	{
 		return [(__bridge DTTextAttachment *)context ascentForLayout];
 	}
 	return 0;
 }
-CGFloat embeddedObjectGetDescentCallback(void *context)
+CGFloat embeddedObjectGetDescentCallback(void *_Nullable context)
 {
 	if ([(__bridge id)context isKindOfClass:[DTTextAttachment class]])
 	{
@@ -31,7 +31,7 @@ CGFloat embeddedObjectGetDescentCallback(void *context)
 	return 0;
 }
 
-CGFloat embeddedObjectGetWidthCallback(void * context)
+CGFloat embeddedObjectGetWidthCallback(void *_Nullable context)
 {
 	if ([(__bridge id)context isKindOfClass:[DTTextAttachment class]])
 	{
@@ -40,7 +40,7 @@ CGFloat embeddedObjectGetWidthCallback(void * context)
 	return 35;
 }
 
-CTRunDelegateRef createEmbeddedObjectRunDelegate(id obj)
+CTRunDelegateRef _Nullable createEmbeddedObjectRunDelegate(id _Nullable obj)
 {
 	CTRunDelegateCallbacks callbacks;
 	callbacks.version = kCTRunDelegateCurrentVersion;
@@ -49,5 +49,4 @@ CTRunDelegateRef createEmbeddedObjectRunDelegate(id obj)
 	callbacks.getDescent = embeddedObjectGetDescentCallback;
 	callbacks.getWidth = embeddedObjectGetWidthCallback;
 	return CTRunDelegateCreate(&callbacks, (__bridge void *)obj);
-	return NULL;
 }