nil -> nullptr on C++11. nil can't be an id for block comparisons.

microsoft · Jan 22, 2018 · 3d5994e · 3d5994e
1 parent 375a009
commit 3d5994e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/objc/runtime.h b/objc/runtime.h
@@ -202,13 +202,17 @@ typedef struct
 #ifdef __GNUC
 #	define _OBJC_NULL_PTR __null
 #elif defined(__cplusplus)
-#	define _OBJC_NULL_PTR 0
+#	if __has_feature(cxx_nullptr)
+#		define _OBJC_NULL_PTR nullptr
+#	else
+#		define _OBJC_NULL_PTR 0
+#	endif
 #else
 #	define _OBJC_NULL_PTR ((void*)0)
 #endif
 
 #ifndef nil
-#	define nil ((id)_OBJC_NULL_PTR)
+#	define nil _OBJC_NULL_PTR
 #endif
 
 #ifndef Nil