ObjFW  Diff

Differences From Artifact [20d6c7fa26]:

• File src/OFMutableDictionary.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: 2996) [annotate] [blame] [check-ins using]

To Artifact [cf03a53ce5]:

• File src/OFMutableDictionary.h — part of check-in [d526d938d7] at 2015-11-21 18:35:39 on branch trunk — Remove OF_NULLABLE / OF_NONNULL

  Now that Clang switched to use _Nullable and _Nonnull instead of
  __nullable / __nonnull, there is no longer a conflict with glibc, which
  means we can just define _Nullable / _Nonnull to nothing if they are not
  understood by the compiler (which did not work with __nullable /
  __nonnull due to this conflict).

  This also defines _Null_unspecified to nothing if unavailable. (user: js, size: 2994) [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 objects in an OFMutableDictionary.
 *
 * @param key The key of the object to replace
 * @param object The object to replace
 * @return The object to replace the object with
 */
typedef id OF_NONNULL (^of_dictionary_replace_block_t)(id key, id object);
#endif

/*!
 * @class OFMutableDictionary OFDictionary.h ObjFW/OFDictionary.h
 *
 * @brief An abstract class for storing and changing objects in a dictionary.
 */

|

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

/*!
 * @brief A block for replacing objects in an OFMutableDictionary.
 *
 * @param key The key of the object to replace
 * @param object The object to replace
 * @return The object to replace the object with
 */
typedef id _Nonnull (^of_dictionary_replace_block_t)(id key, id object);
#endif

/*!
 * @class OFMutableDictionary OFDictionary.h ObjFW/OFDictionary.h
 *
 * @brief An abstract class for storing and changing objects in a dictionary.
 */