kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 17:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from NZKoz/master

Browse Source 
Fixes for the MR_* macros when ARC is not enabled.
This commit is contained in:
Magical Panda Software
2011-12-05 18:26:27 -08:00
parent 1ad46a7f8c 3dd7591d18
commit 18d984e363
6 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Categories/NSManagedObjectContext+MagicalRecord.m
View File

@@ -31,10 +31,8 @@ NSString * const kMagicalRecordDidMergeChangesFromiCloudNotification = @"kMagica
+ (void) MR_setDefaultContext:(NSManagedObjectContext *)moc
{
#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
[moc retain];
[defaultManageObjectContext_ release];
#endif
MR_RETAIN(moc);
MR_RELEASE(defaultManageObjectContext_);
defaultManageObjectContext_ = moc;
}
@@ -167,7 +165,7 @@ NSString * const kMagicalRecordDidMergeChangesFromiCloudNotification = @"kMagica
- (void) MR_saveWrapper;
{
#ifdef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
#if MR_USE_ARC
@autoreleasepool
{
[self MR_save];

6
Source/Categories/NSManagedObjectModel+MagicalRecord.m
View File

@@ -25,10 +25,8 @@ static NSManagedObjectModel *defaultManagedObjectModel_ = nil;
+ (void) MR_setDefaultManagedObjectModel:(NSManagedObjectModel *)newDefaultModel
{
#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
[newDefaultModel retain];
[defaultManagedObjectModel_ release];
#endif
MR_RETAIN(newDefaultModel);
MR_RELEASE(defaultManagedObjectModel_);
defaultManagedObjectModel_ = newDefaultModel;
}

6
Source/Categories/NSPersistentStore+MagicalRecord.m
View File

@@ -22,10 +22,8 @@ static NSPersistentStore *defaultPersistentStore_ = nil;
+ (void) MR_setDefaultPersistentStore:(NSPersistentStore *) store
{
#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
[store retain];
[defaultPersistentStore_ release];
#endif
MR_RETAIN(store);
MR_RELEASE(defaultPersistentStore_);
defaultPersistentStore_ = store;
}

6
Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
View File

@@ -29,10 +29,8 @@ NSString * const kMagicalRecordPSCDidCompleteiCloudSetupNotification = @"kMagica
+ (void) MR_setDefaultStoreCoordinator:(NSPersistentStoreCoordinator *)coordinator
{
#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
[coordinator retain];
[defaultCoordinator_ release];
#endif
MR_RETAIN(coordinator);
MR_RELEASE(defaultCoordinator_);
defaultCoordinator_ = coordinator;
if (defaultCoordinator_ != nil)

14
Source/CoreData+MagicalRecord.h
View File

@@ -18,14 +18,18 @@
#import <CoreData/CoreData.h>
#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
#define MR_RETAIN(xx) [xx retain];
#define MR_RELEASE(xx) [xx release];
#define MR_AUTORELEASE(xx) [xx autorelease];
#else
#ifndef MR_USE_ARC
#define MR_USE_ARC 1
#endif
#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

4
Source/MagicalRecordHelpers.m
View File

@@ -417,9 +417,7 @@ NSDate * dateFromString(NSString *value, NSString *format)
[formatter setDateFormat:format];
NSDate *parsedDate = [formatter dateFromString:value];
#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
[formatter autorelease];
#endif
MR_AUTORELEASE(formatter);
return parsedDate;
}