ObjFW  Diff

Differences From Artifact [73428ea9d3]:

• File src/OFMutableArray.h — part of check-in [9e76144ef8] at 2015-06-13 22:26:05 on branch trunk — Add support for and use the new nullability (user: js, size: 5666) [annotate] [blame] [check-ins using]

To Artifact [665e799b10]:

• File src/OFMutableArray.h — part of check-in [b7097a67b6] at 2015-06-14 10:45:10 on branch trunk — Add OF_NONNULL / OF_NULLABLE and use that instead

  Using __nonnull directly doesn't work on systems using glibc, as glibc
  defines __nonnull as a parameterized define. While this does not fix the
  problem of Clang introducing __nonnull even though it conflicts with
  glibc, this at least means it's possible again to compile things with
  versions of Clang that don't support __nonnull on systems with glibc. (user: js, size: 5667) [annotate] [blame] [check-ins using]

24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

/*!
 * @brief A block for replacing values in an OFMutableArray.
 *
 * @param object The object to replace
 * @param index The index of the object to replace
 * @return The object to replace the object with
 */
typedef __nonnull id (^of_array_replace_block_t)(id object, size_t index);
#endif

/*!
 * @class OFMutableArray OFArray.h ObjFW/OFArray.h
 *
 * @brief An abstract class for storing, adding and removing objects in an
 *	  array.

|

24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

/*!
 * @brief A block for replacing values in an OFMutableArray.
 *
 * @param object The object to replace
 * @param index The index of the object to replace
 * @return The object to replace the object with
 */
typedef id OF_NONNULL (^of_array_replace_block_t)(id object, size_t index);
#endif

/*!
 * @class OFMutableArray OFArray.h ObjFW/OFArray.h
 *
 * @brief An abstract class for storing, adding and removing objects in an
 *	  array.