Changeset 23377

Timestamp:

05/09/2008 12:34:58 PM (7 months ago)

Author:

evands

Message:

Don't use fast enumeration. Checking the MIN_REQUIRED isn't working, and I can't make myself care quite enough to figure out why since it's easy to just use a #define ENABLE_FAST_ENUMERATION FALSE to disable it. This fixes compilation on 10.4 systems and unbreaks Facebook support on 10.4.

Files:

• trunk/Frameworks/JSON Framework/Source/NSObject+SBJSON.m (modified) (3 diffs)

trunk/Frameworks/JSON Framework/Source/NSObject+SBJSON.m

@@ -29 +29 @@
-
-#import "NSObject+SBJSON.h"
+
+/* #define ENABLE_FAST_ENUMERATION MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 */
+#define ENABLE_FAST_ENUMERATION FALSE
-
-typedef struct {
@@ -168 +171 @@
-    if( x->indent ) [json appendString: open];
-    x->depth++;
-
-
-
-
-
+
-    int i=-1;
-    for( id item in self ) {
-        i++;
+#else
+        unsigned n = [self count];
+        for (int i = 0; i < n; i++) {
+                id item = [self objectAtIndex:i];                       
-#endif
-        if( i>0 ) [json appendString: sep];
@@ -219 +222 @@
-    x->depth++;
-    NSArray *keys = [[self allKeys] sortedArrayUsingSelector:@selector(compare:)];
-
-
+
+
+
+
+
+
-    for (int i = 0; i < n; i++) {
-        NSString *key = [keys objectAtIndex:i];
-#else
-    int i=-1;
-    for( NSString *key in keys ) {
-        i++;
-#endif
-        if( i>0 ) [json appendString: sep];