summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/OFData.m2
-rw-r--r--src/OFDate.m2
-rw-r--r--src/OFNumber.m2
-rw-r--r--src/OFRunLoop.h2
-rw-r--r--src/OFSortedList.h9
-rw-r--r--src/OFString.m2
-rw-r--r--src/OFString_UTF8.m2
-rw-r--r--src/OFTimer.m2
8 files changed, 16 insertions, 7 deletions
diff --git a/src/OFData.m b/src/OFData.m
index 7fc81c5c..f0e536be 100644
--- a/src/OFData.m
+++ b/src/OFData.m
@@ -436,7 +436,7 @@ _references_to_categories_of_OFData(void)
return true;
}
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
{
OFData *data;
int comparison;
diff --git a/src/OFDate.m b/src/OFDate.m
index a248a918..4296a7ee 100644
--- a/src/OFDate.m
+++ b/src/OFDate.m
@@ -397,7 +397,7 @@ tmAndTzToTime(struct tm *tm, int16_t *tz)
return [self retain];
}
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
{
OFDate *otherDate;
diff --git a/src/OFNumber.m b/src/OFNumber.m
index 3544fdac..0b45ce63 100644
--- a/src/OFNumber.m
+++ b/src/OFNumber.m
@@ -763,7 +763,7 @@
return ([number uIntMaxValue] == [self uIntMaxValue]);
}
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
{
OFNumber *number;
diff --git a/src/OFRunLoop.h b/src/OFRunLoop.h
index 10868041..e72e9b4b 100644
--- a/src/OFRunLoop.h
+++ b/src/OFRunLoop.h
@@ -43,7 +43,7 @@ OF_ASSUME_NONNULL_BEGIN
<OFKernelEventObserverDelegate>
#endif
{
- OFSortedList *_timersQueue;
+ OFSortedList OF_GENERIC(OFTimer *) *_timersQueue;
#ifdef OF_HAVE_THREADS
OFMutex *_timersQueueLock;
#endif
diff --git a/src/OFSortedList.h b/src/OFSortedList.h
index d0f8f489..2bdf7389 100644
--- a/src/OFSortedList.h
+++ b/src/OFSortedList.h
@@ -30,6 +30,15 @@ OF_ASSUME_NONNULL_BEGIN
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# define ObjectType id
#endif
+- (of_list_object_t *)appendObject: (ObjectType)object OF_UNAVAILABLE;
+- (of_list_object_t *)prependObject: (ObjectType)object OF_UNAVAILABLE;
+- (of_list_object_t *)insertObject: (ObjectType)object
+ beforeListObject: (of_list_object_t *)listObject
+ OF_UNAVAILABLE;
+- (of_list_object_t *)insertObject: (ObjectType)object
+ afterListObject: (of_list_object_t *)listObject
+ OF_UNAVAILABLE;
+
/*!
* @brief Inserts the object to the list while keeping the list sorted.
*
diff --git a/src/OFString.m b/src/OFString.m
index 8b97ad57..803dae66 100644
--- a/src/OFString.m
+++ b/src/OFString.m
@@ -1552,7 +1552,7 @@ decomposedString(OFString *self, const char *const *const *table, size_t size)
return [[OFMutableString alloc] initWithString: self];
}
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
{
void *pool;
OFString *otherString;
diff --git a/src/OFString_UTF8.m b/src/OFString_UTF8.m
index 93087a07..38aeb0f5 100644
--- a/src/OFString_UTF8.m
+++ b/src/OFString_UTF8.m
@@ -808,7 +808,7 @@ of_string_utf8_get_position(const char *string, size_t idx, size_t length)
return true;
}
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
{
OFString *otherString;
size_t otherCStringLength, minimumCStringLength;
diff --git a/src/OFTimer.m b/src/OFTimer.m
index e7dc03d2..083b0f76 100644
--- a/src/OFTimer.m
+++ b/src/OFTimer.m
@@ -506,7 +506,7 @@
[super dealloc];
}
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
{
OFTimer *timer;