From 4627257e433c29f4ee5bb8ebb69367fa4049a1f6 Mon Sep 17 00:00:00 2001 From: Saul Mora Date: Tue, 15 Feb 2011 09:41:02 -0700 Subject: [PATCH] Changed type of default batch size to NSUInteger, fixed logging --- CoreData+ActiveRecordFetching.h | 2 +- NSManagedObject+ActiveRecord.m | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CoreData+ActiveRecordFetching.h b/CoreData+ActiveRecordFetching.h index 84d4c06..27c49c0 100644 --- a/CoreData+ActiveRecordFetching.h +++ b/CoreData+ActiveRecordFetching.h @@ -7,7 +7,7 @@ #ifdef ENABLE_ACTIVE_RECORD_LOGGING #define ARLog(...) NSLog(@"%s(%x) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__]) #else - #define ARLog(...) + #define ARLog(...) ((void)0) #endif #import "ActiveRecordHelpers.h" diff --git a/NSManagedObject+ActiveRecord.m b/NSManagedObject+ActiveRecord.m index c88305e..bf6e19d 100644 --- a/NSManagedObject+ActiveRecord.m +++ b/NSManagedObject+ActiveRecord.m @@ -8,26 +8,26 @@ #import "NSManagedObjectContext+ActiveRecord.h" -static NSNumber *defaultBatchSize = nil; +static NSUInteger defaultBatchSize = kActiveRecordDefaultBatchSize; @implementation NSManagedObject (ActiveRecord) + (void) setDefaultBatchSize:(NSUInteger)newBatchSize { - @synchronized(defaultBatchSize) + @synchronized(self) { - defaultBatchSize = [NSNumber numberWithInt:newBatchSize]; + defaultBatchSize = newBatchSize; } } -+ (NSInteger) defaultBatchSize ++ (NSUInteger) defaultBatchSize { if (defaultBatchSize == nil) { [self setDefaultBatchSize:kActiveRecordDefaultBatchSize]; } - return [defaultBatchSize integerValue]; + return defaultBatchSize; } + (void) handleErrors:(NSError *)error