summaryrefslogtreecommitdiff
path: root/macosx/PcsxrMemCardArray.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-10 18:18:15 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-10 18:18:15 +0000
commita3ac4842bd5c7058b1363f7d3307f61724fc7178 (patch)
tree0e71322d034432a925cbdab2f5e92bc891d3efde /macosx/PcsxrMemCardArray.m
parentaca9c8411f7b86b1ee685965c70e7be682a9a4d0 (diff)
downloadpcsxr-a3ac4842bd5c7058b1363f7d3307f61724fc7178.tar.gz
Remove 32-bit support on OS X.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87114 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrMemCardArray.m')
-rw-r--r--macosx/PcsxrMemCardArray.m16
1 files changed, 2 insertions, 14 deletions
diff --git a/macosx/PcsxrMemCardArray.m b/macosx/PcsxrMemCardArray.m
index 99a1f492..a867c938 100644
--- a/macosx/PcsxrMemCardArray.m
+++ b/macosx/PcsxrMemCardArray.m
@@ -7,7 +7,6 @@
//
#import "PcsxrMemCardArray.h"
-#import "ARCBridge.h"
#import "ConfigurationController.h"
#include "sio.h"
@@ -65,7 +64,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
}
@interface PcsxrMemCardArray ()
-@property (arcretain) NSArray *rawArray;
+@property (strong) NSArray *rawArray;
@property (readonly) char* memDataPtr;
@end
@@ -124,12 +123,10 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
@autoreleasepool {
PcsxrMemoryObject *obj = [[PcsxrMemoryObject alloc] initWithMcdBlock:&memBlock startingIndex:i size:x];
[tmpMemArray addObject:obj];
- RELEASEOBJ(obj);
}
i += x;
}
self.rawArray = [NSArray arrayWithArray:tmpMemArray];
- RELEASEOBJ(tmpMemArray);
}
return self;
}
@@ -240,7 +237,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
theBlock.Flags = 0xA0;
theBlock.IconCount = 0;
PcsxrMemoryObject *freeObj = [[PcsxrMemoryObject alloc] initWithMcdBlock:&theBlock startingIndex:MAX_MEMCARD_BLOCKS - 1 - freeSize size:freeSize];
- return [rawArray arrayByAddingObject:AUTORELEASEOBJ(freeObj)];
+ return [rawArray arrayByAddingObject:freeObj];
} else
return rawArray;
}
@@ -345,13 +342,4 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
}
}
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
- self.rawArray = nil;
-
- [super dealloc];
-}
-#endif
-
@end