ObjFW  Diff

Differences From Artifact [1619f8ecc0]:

• File src/macros.h — part of check-in [5116342c0a] at 2015-06-28 16:28:32 on branch trunk — Add OF_SUBCLASSING_RESTRICTED (user: js, size: 14926) [annotate] [blame] [check-ins using]

To Artifact [a5359bc24a]:

• File src/macros.h — part of check-in [2fb22c605b] at 2015-10-01 20:34:22 on branch trunk — Use _Nullable instead of __nullable

  Same for _Nonnull / __nonnull.

  Apple implemented it as __nullable / __nonnull in their version of Clang
  and sent that for upstreaming. My inital comments about this being a
  potential problem and to better use _Nullable / _Nonnull had been
  rejected as being too late, so I assumed it stayed that way. But
  apparently, it has been changed to _Nullable / _Nonnull before the 3.7.0
  release. (user: js, size: 14924) [annotate] [blame] [check-ins using] [more...]

173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188

#else
# define OF_GENERIC(...)
#endif

#if __has_feature(nullability)
# define OF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
# define OF_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
# define OF_NONNULL __nonnull
# define OF_NULLABLE __nullable
# define OF_NULLABLE_PROPERTY(...) (__VA_ARGS__, nullable)
#else
# define OF_ASSUME_NONNULL_BEGIN
# define OF_ASSUME_NONNULL_END
# define OF_NONNULL
# define OF_NULLABLE
# define OF_NULLABLE_PROPERTY

|
|

173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188

#else
# define OF_GENERIC(...)
#endif

#if __has_feature(nullability)
# define OF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
# define OF_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
# define OF_NONNULL _Nonnull
# define OF_NULLABLE _Nullable
# define OF_NULLABLE_PROPERTY(...) (__VA_ARGS__, nullable)
#else
# define OF_ASSUME_NONNULL_BEGIN
# define OF_ASSUME_NONNULL_END
# define OF_NONNULL
# define OF_NULLABLE
# define OF_NULLABLE_PROPERTY