Skip to content

Commit 3d5994e

Browse files
committed
nil -> nullptr on C++11. nil can't be an id for block comparisons.
1 parent 375a009 commit 3d5994e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

objc/runtime.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,17 @@ typedef struct
202202
#ifdef __GNUC
203203
# define _OBJC_NULL_PTR __null
204204
#elif defined(__cplusplus)
205-
# define _OBJC_NULL_PTR 0
205+
# if __has_feature(cxx_nullptr)
206+
# define _OBJC_NULL_PTR nullptr
207+
# else
208+
# define _OBJC_NULL_PTR 0
209+
# endif
206210
#else
207211
# define _OBJC_NULL_PTR ((void*)0)
208212
#endif
209213

210214
#ifndef nil
211-
# define nil ((id)_OBJC_NULL_PTR)
215+
# define nil _OBJC_NULL_PTR
212216
#endif
213217

214218
#ifndef Nil

0 commit comments

Comments
 (0)