diff --git a/SDImageCache.m b/SDImageCache.m index 2135081..b79c991 100644 --- a/SDImageCache.m +++ b/SDImageCache.m @@ -81,9 +81,7 @@ static SDImageCache *instance; [[NSNotificationCenter defaultCenter] removeObserver:self]; -#if ! __has_feature(objc_arc) - [super dealloc]; -#endif + SDWISuperDealoc; } #pragma mark SDImageCache (class methods) diff --git a/SDWebImageCompat.h b/SDWebImageCompat.h index dfc24e2..c15e170 100644 --- a/SDWebImageCompat.h +++ b/SDWebImageCompat.h @@ -29,6 +29,7 @@ #define SDWIReturnRetained SDWIRetain #define SDWIRelease(__v) ([__v release], __v = nil); +#define SDWISuperDealoc [super dealloc]; #define SDWIWeak #else @@ -40,6 +41,7 @@ #define SDWIReturnRetained(__v) (__v) #define SDWIRelease(__v) +#define SDWISuperDealoc #define SDWIWeak __unsafe_unretained #endif diff --git a/SDWebImageDecoder.m b/SDWebImageDecoder.m index 7361300..e747de6 100644 --- a/SDWebImageDecoder.m +++ b/SDWebImageDecoder.m @@ -77,10 +77,7 @@ static SDWebImageDecoder *sharedInstance; - (void)dealloc { SDWIRelease(imageDecodingQueue); - -#if ! __has_feature(objc_arc) - [super dealloc]; -#endif + SDWISuperDealoc; } + (SDWebImageDecoder *)sharedImageDecoder diff --git a/SDWebImageDownloader.m b/SDWebImageDownloader.m index a7b6806..1fa49f3 100644 --- a/SDWebImageDownloader.m +++ b/SDWebImageDownloader.m @@ -157,10 +157,7 @@ NSString *const SDWebImageDownloadStopNotification = @"SDWebImageDownloadStopNot SDWIRelease(connection); SDWIRelease(imageData); SDWIRelease(userInfo); - -#if ! __has_feature(objc_arc) - [super dealloc]; -#endif + SDWISuperDealoc; } diff --git a/SDWebImageManager.m b/SDWebImageManager.m index 39ca1d4..b518db5 100644 --- a/SDWebImageManager.m +++ b/SDWebImageManager.m @@ -52,10 +52,7 @@ static SDWebImageManager *instance; SDWIRelease(cacheURLs); SDWIRelease(downloaderForURL); SDWIRelease(failedURLs); - -#if ! __has_feature(objc_arc) - [super dealloc]; -#endif + SDWISuperDealoc; } diff --git a/SDWebImagePrefetcher.m b/SDWebImagePrefetcher.m index a06b6f0..e87e189 100644 --- a/SDWebImagePrefetcher.m +++ b/SDWebImagePrefetcher.m @@ -106,10 +106,7 @@ static SDWebImagePrefetcher *instance; - (void)dealloc { self.prefetchURLs = nil; - -#if ! __has_feature(objc_arc) - [super dealloc]; -#endif + SDWISuperDealoc; } @end