ObjFW  Diff

Differences From Artifact [babbf9f98a]:

• File src/OFArray_adjacent.m — part of check-in [13ee56edf3] at 2014-06-21 21:43:43 on branch trunk — Move all macros from OFObject.h to macros.h

  This means that OFObject.h imports macros.h now, making it unnecessary
  to manually import macros.h in almost every file. And while at it, also
  import autorelease.h in OFObject.h, so that this doesn't need to be
  manually imported in almost every file as well. (user: js, size: 7135) [annotate] [blame] [check-ins using]

To Artifact [f2533d462f]:

• File src/OFArray_adjacent.m — part of check-in [2ecede1f96] at 2014-07-16 17:02:30 on branch trunk — Fix check in -[OFDictionary_hashtable isEqual:]

  Instead of checking the passed dictionary, this checked self, which of
  course would always be of type OFDictionary_hashtable.

  While at it, use -[isKindOfClass:] instead for the check. (user: js, size: 7090) [annotate] [blame] [check-ins using]

286
287
288
289
290
291
292
293
294


295
296
297
298
299
300
301
302

286
287
288
289
290
291
292


293
294

295
296
297
298
299
300
301

-
-
+
+
-

- (bool)isEqual: (id)object
{
	OFArray *otherArray;
	id const *objects, *otherObjects;
	size_t i, count;

	if ([object class] != [OFArray_adjacent class] &&
	    [object class] != [OFMutableArray_adjacent class] &&
	if (![object isKindOfClass: [OFArray_adjacent class]] &&
	    ![object isKindOfClass: [OFMutableArray_adjacent class]])
	    [object class] != [OFArray_adjacentSubarray class])
		return [super isEqual: object];

	otherArray = object;

	count = [_array count];

	if (count != [otherArray count])