Merged from pull request

magicalpanda · Dec 6, 2011 · c8ffde3 · c8ffde3
2 parents 10a3fec + 18d984e
commit c8ffde3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 26 deletions.
diff --git a/Source/Categories/NSManagedObjectContext+MagicalRecord.m b/Source/Categories/NSManagedObjectContext+MagicalRecord.m
@@ -34,11 +34,9 @@ + (void) MR_setDefaultContext:(NSManagedObjectContext *)moc
     NSPersistentStoreCoordinator *coordinator = [NSPersistentStoreCoordinator MR_defaultStoreCoordinator];
     [defaultManageObjectContext_ MR_stopObservingiCloudChangesInCoordinator:coordinator];
 
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+    MR_RETAIN(moc);
-    [moc retain];
+    MR_RELEASE(defaultManageObjectContext_);
-    [defaultManageObjectContext_ release];
+
-#endif
-
     defaultManageObjectContext_ = moc;
     [defaultManageObjectContext_ MR_observeiCloudChangesInCoordinator:coordinator];
 }
@@ -182,7 +180,7 @@ - (BOOL) MR_saveWithErrorHandler:(void (^)(NSError *))errorCallback;
 
 - (void) MR_saveWrapper;
 {
-#ifdef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+#if MR_USE_ARC
     @autoreleasepool
     {
         [self MR_save];

diff --git a/Source/Categories/NSManagedObjectModel+MagicalRecord.m b/Source/Categories/NSManagedObjectModel+MagicalRecord.m
@@ -25,10 +25,8 @@ + (NSManagedObjectModel *) MR_defaultManagedObjectModel
 
 + (void) MR_setDefaultManagedObjectModel:(NSManagedObjectModel *)newDefaultModel
 {
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+    MR_RETAIN(newDefaultModel);
-    [newDefaultModel retain];
+    MR_RELEASE(defaultManagedObjectModel_);
-    [defaultManagedObjectModel_ release];
-#endif
 	defaultManagedObjectModel_ = newDefaultModel;
 }
 

diff --git a/Source/Categories/NSPersistentStore+MagicalRecord.m b/Source/Categories/NSPersistentStore+MagicalRecord.m
@@ -22,10 +22,8 @@ + (NSPersistentStore *) MR_defaultPersistentStore
 
 + (void) MR_setDefaultPersistentStore:(NSPersistentStore *) store
 {
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+    MR_RETAIN(store);
-    [store retain];
+    MR_RELEASE(defaultPersistentStore_);
-    [defaultPersistentStore_ release];
-#endif
 	defaultPersistentStore_ = store;
 }
 

diff --git a/Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m b/Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
@@ -29,10 +29,8 @@ + (NSPersistentStoreCoordinator *) MR_defaultStoreCoordinator
 
 + (void) MR_setDefaultStoreCoordinator:(NSPersistentStoreCoordinator *)coordinator
 {
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+    MR_RETAIN(coordinator);
-    [coordinator retain];
+    MR_RELEASE(defaultCoordinator_);
-    [defaultCoordinator_ release];
-#endif
 	defaultCoordinator_ = coordinator;
 
     if (defaultCoordinator_ != nil)

diff --git a/Source/CoreData+MagicalRecord.h b/Source/CoreData+MagicalRecord.h
@@ -18,14 +18,18 @@
 
 #import <CoreData/CoreData.h>
 
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+#ifndef MR_USE_ARC
-#define MR_RETAIN(xx)           [xx retain];
+#define MR_USE_ARC 1
-#define MR_RELEASE(xx)          [xx release];
+#endif
-#define MR_AUTORELEASE(xx)      [xx autorelease];
+
-#else
+#if MR_USE_ARC
 #define MR_RETAIN(xx)  ((void)0)
 #define MR_RELEASE(xx)  ((void)0)
 #define MR_AUTORELEASE(xx)  ((void)0)
+#else
+#define MR_RETAIN(xx)           [xx retain];
+#define MR_RELEASE(xx)          [xx release];
+#define MR_AUTORELEASE(xx)      [xx autorelease];
 #endif
 
 #ifdef MR_SHORTHAND

diff --git a/Source/MagicalRecordHelpers.m b/Source/MagicalRecordHelpers.m
@@ -421,9 +421,7 @@ BOOL addMagicalRecordShortHandMethodToPrefixedClassMethod(Class klass, SEL origi
     [formatter setDateFormat:format];
 
     NSDate *parsedDate = [formatter dateFromString:value];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+    MR_AUTORELEASE(formatter);
-    [formatter autorelease];
-#endif
 
     return parsedDate;
 }