diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 08:15:43 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 08:15:43 +0000 |
| commit | 59fabe735ceec97744859484ad4cd9c52f73d938 (patch) | |
| tree | 276eefa3982cda2aa11662d737a3361cc56767ed | |
| parent | b797c32f080fbdb69f4c84ace14a496b34423551 (diff) | |
| download | pcsxr-59fabe735ceec97744859484ad4cd9c52f73d938.tar.gz | |
Fix a bug in OS X 32-bit code.
Get rid of an unused ivar, as pointed out by Clang.
Adding a comment about a false positive in Clang's static analyzer.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85933 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rwxr-xr-x | macosx/ConfigurationController.h | 2 | ||||
| -rw-r--r-- | macosx/LaunchArg.m | 2 | ||||
| -rw-r--r-- | macosx/PcsxrMemCardArray.h | 1 | ||||
| -rwxr-xr-x | macosx/PluginList.m | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/macosx/ConfigurationController.h b/macosx/ConfigurationController.h index d9679a05..90547816 100755 --- a/macosx/ConfigurationController.h +++ b/macosx/ConfigurationController.h @@ -48,7 +48,7 @@ extern NSString *const memCardChangeNumberKey; - (IBAction)setVideoType:(id)sender; - (NSString *)keyForSender:(id)sender; -+ (void)setMemoryCard:(int)theCard toPath:(NSString *)theFile DEPRECATED_ATTRIBUTE; ++ (void)setMemoryCard:(int)theCard toPath:(NSString *)theFile; + (void)setMemoryCard:(int)theCard toURL:(NSURL *)theURL; + (void)mcdNewClicked:(id)sender; diff --git a/macosx/LaunchArg.m b/macosx/LaunchArg.m index 4923cc02..5af89cf3 100644 --- a/macosx/LaunchArg.m +++ b/macosx/LaunchArg.m @@ -27,7 +27,7 @@ if (_theBlock == theBlock) { return; } - dispatch_block_t tmpBlock = _theBlock + dispatch_block_t tmpBlock = _theBlock; _theBlock = [theBlock copy]; [tmpBlock release]; #endif diff --git a/macosx/PcsxrMemCardArray.h b/macosx/PcsxrMemCardArray.h index 87dcbec7..0ace4f2d 100644 --- a/macosx/PcsxrMemCardArray.h +++ b/macosx/PcsxrMemCardArray.h @@ -14,7 +14,6 @@ @private NSArray *rawArray; int cardNumber; - NSURL *fileURL; } - (id)initWithMemoryCardNumber:(int)carNum; diff --git a/macosx/PluginList.m b/macosx/PluginList.m index 944a3c6c..621e7f3c 100755 --- a/macosx/PluginList.m +++ b/macosx/PluginList.m @@ -235,6 +235,7 @@ const static int typeList[] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, P // stop the old plugin and start the new one if (pluginPtr) { [pluginPtr shutdownAs:type]; + //NOTE: We can ignore Clang's "Incorrect Decrement" here RELEASEOBJ(pluginPtr); } |