[Bibdesk-commit] SF.net SVN: bibdesk: [7152] trunk/bibdesk/NSArray_BDSKExtensions.m

[<ama...@us...>]

Revision: 7152
Author:   amaxwell
Date:     2006-07-29 20:10:19 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7152&view=rev

Log Message:
-----------
Change a typedef name to avoid confusion.

Modified Paths:
--------------
    trunk/bibdesk/NSArray_BDSKExtensions.m
Modified: trunk/bibdesk/NSArray_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSArray_BDSKExtensions.m	2006-07-30 03:00:40 UTC (rev 7151)
+++ trunk/bibdesk/NSArray_BDSKExtensions.m	2006-07-30 03:10:19 UTC (rev 7152)
@@ -129,17 +129,19 @@
 #pragma mark -
 #pragma mark NSSortDescriptor subclass performance improvements
 
+
 @implementation NSSortDescriptor (Mergesort)
 
 /* The objects an NSSortDescriptor receives in compareObject:toObject: are not the objects that will be compared; you need to call valueForKeyPath: on them.  Unfortunately, this is really inefficient, and also precludes caching on the data end, since the sort descriptor would then call valueForKeyPath: again.  Hence, we add this method to compare the results of valueForKeyPath:, which expects the objects that will be passed to the comparator selector directly.  This gives subclasses an override point that still allows data-side caching of valueForKeyPath: for efficiency.
 */
 - (NSComparisonResult)compareEndObject:(id)object1 toEndObject:(id)object2;
-{
-    typedef NSComparisonResult (*comparatorIMP)(id, SEL, id);
+{    
     
+    typedef NSComparisonResult (*compareIMP)(id, SEL, id);    
+
     SEL theSelector = [self selector];
     BOOL isAscending = [self ascending];
-    comparatorIMP comparator = (comparatorIMP)[object1 methodForSelector:theSelector];
+    compareIMP comparator = (compareIMP)[object1 methodForSelector:theSelector];
     NSComparisonResult result = comparator(object1, theSelector, object2);
     
     return isAscending ? result : (result *= -1);
@@ -153,6 +155,7 @@
 static id __sort = nil;
 static SEL __selector = NULL;
 
+// typedef used for NSArray sorting category
 typedef NSComparisonResult (*comparatorIMP)(id, SEL, id, id);    
 static comparatorIMP __comparator = NULL;
 
@@ -182,8 +185,8 @@
                 equalRanges = (NSRange *)NSZoneRealloc(zone, equalRanges, (*numRanges) * sizeof(NSRange));
                 equalRanges[(*numRanges) - 1].location = i;
                 equalRanges[(*numRanges) - 1].length = j - i;
-                //                NSLog(@"equalityRange of %@", NSStringFromRange(NSMakeRange(i, j-i)));
-                //                NSLog(@"objects are %@ and %@", (SortCacheValue *)(&buf[i])->sortValue, (SortCacheValue *)(&buf[j-1])->sortValue);
+//                NSLog(@"equalityRange of %@", NSStringFromRange(NSMakeRange(i, j-i)));
+//                NSLog(@"objects are %@ and %@", (SortCacheValue *)(&buf[i])->sortValue, (SortCacheValue *)(&buf[j-1])->sortValue);
                 i = j;
             } else {
                 i++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.