Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merging fixes for iOS4

  • Loading branch information...
commit ac1135c23a4ab6c8244737baa056d7e1aeae86b0 2 parents 5b1442e + 0dc65ac
@casademora casademora authored
View
2  Source/Categories/NSManagedObjectModel+MagicalRecord.m
@@ -39,7 +39,7 @@ + (NSManagedObjectModel *) MR_mergedObjectModelFromMainBundle;
+ (NSManagedObjectModel *) MR_newManagedObjectModel
{
NSManagedObjectModel *model = [self MR_mergedObjectModelFromMainBundle];
- MR_AUTORELEASE(model);
+ MR_RETAIN(model);
return model;
}
View
1  Source/Categories/NSPersistentStore+MagicalRecord.m
@@ -65,6 +65,7 @@ + (NSURL *) MR_urlForStoreName:(NSString *)storeFileName
+ (NSURL *) MR_cloudURLForUbiqutiousContainer:(NSString *)bucketName;
{
NSFileManager *fileManager = [[NSFileManager alloc] init];
+ MR_AUTORELEASE(fileManager);
NSURL *cloudURL = [fileManager URLForUbiquityContainerIdentifier:bucketName];
return cloudURL;
View
1  Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
@@ -263,6 +263,7 @@ - (NSMutableDictionary *) MR_dictionaryByMergingDictionary:(NSDictionary *)d;
{
NSMutableDictionary *mutDict = [self mutableCopy];
[mutDict addEntriesFromDictionary:d];
+ MR_AUTORELEASE(mutDict);
return mutDict;
}
View
9 Source/CoreData+MagicalRecord.h
@@ -4,7 +4,9 @@
#define kCreateNewCoordinatorOnBackgroundOperations 0
+#ifndef ENABLE_ACTIVE_RECORD_LOGGING
#define ENABLE_ACTIVE_RECORD_LOGGING
+#endif
#ifdef ENABLE_ACTIVE_RECORD_LOGGING
#ifdef LOG_VERBOSE
@@ -23,9 +25,10 @@
#endif
#if MR_USE_ARC
-#define MR_RETAIN(xx) ((void)0)
-#define MR_RELEASE(xx) ((void)0)
-#define MR_AUTORELEASE(xx) ((void)0)
+
+#define MR_RETAIN(xx)
+#define MR_RELEASE(xx)
+#define MR_AUTORELEASE(xx)
#else
#define MR_RETAIN(xx) [xx retain];
#define MR_RELEASE(xx) [xx release];
View
2  Source/MagicalRecordHelpers.m
@@ -422,7 +422,7 @@ BOOL addMagicalRecordShortHandMethodToPrefixedClassMethod(Class klass, SEL origi
NSDate *parsedDate = [formatter dateFromString:value];
MR_AUTORELEASE(formatter);
-
+
return parsedDate;
}
Please sign in to comment.
Something went wrong with that request. Please try again.