ObjFW  Diff

Differences From Artifact [baf6f7542e]:

• File src/OFObject.h — part of check-in [1ba08eebc5] at 2015-10-19 22:15:13 on branch trunk — Add platform.h & make platform defines consistent (user: js, size: 27027) [annotate] [blame] [check-ins using]

To Artifact [95294129a9]:

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

939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955

- (of_comparison_result_t)compare: (id <OFComparing>)object;
@end

#ifdef __cplusplus
extern "C" {
#endif
extern id of_alloc_object(Class class_, size_t extraSize,
    size_t extraAlignment, void *OF_NULLABLE *OF_NULLABLE extra);
extern void OF_NO_RETURN_FUNC of_method_not_found(id self, SEL _cmd);
extern uint32_t of_hash_seed;
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END

#import "OFObject+Serialization.h"

|

939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955

- (of_comparison_result_t)compare: (id <OFComparing>)object;
@end

#ifdef __cplusplus
extern "C" {
#endif
extern id of_alloc_object(Class class_, size_t extraSize,
    size_t extraAlignment, void *_Nullable *_Nullable extra);
extern void OF_NO_RETURN_FUNC of_method_not_found(id self, SEL _cmd);
extern uint32_t of_hash_seed;
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END

#import "OFObject+Serialization.h"