evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Issue #557] Replacing AF_DISPATCH_RETAIN_RELEASE macro with OS_OBJECT_USE_OBJC (thanks, @nakiwo)

Browse source
This commit is contained in:
Mattt Thompson 2012-10-05 09:27:49 -07:00
parent a244a53b66
commit c091bb5ebe
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AFNetworking/AFHTTPClient.m
View file

@ -40,12 +40,6 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
// Workaround for management of dispatch_retain() / dispatch_release() by ARC with iOS 6 / Mac OS X 10.8
#if (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && (!defined(__IPHONE_6_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0)) || \
(defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && (!defined(__MAC_10_8) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8))
#define AF_DISPATCH_RETAIN_RELEASE 1
#endif
#ifdef _SYSTEMCONFIGURATION_H #ifdef _SYSTEMCONFIGURATION_H
NSString * const AFNetworkingReachabilityDidChangeNotification = @"com.alamofire.networking.reachability.change"; NSString * const AFNetworkingReachabilityDidChangeNotification = @"com.alamofire.networking.reachability.change";
NSString * const AFNetworkingReachabilityNotificationStatusItem = @"AFNetworkingReachabilityNotificationStatusItem"; NSString * const AFNetworkingReachabilityNotificationStatusItem = @"AFNetworkingReachabilityNotificationStatusItem";
@ -561,7 +555,7 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) {}
completionBlock(operations); completionBlock(operations);
} }
}); });
#ifdef AF_DISPATCH_RETAIN_RELEASE #ifdef OS_OBJECT_USE_OBJC
dispatch_release(dispatchGroup); dispatch_release(dispatchGroup);
#endif #endif
}]; }];

18
AFNetworking/AFHTTPRequestOperation.m
View file

@ -30,12 +30,6 @@
#define AF_CAST_TO_BLOCK __bridge void * #define AF_CAST_TO_BLOCK __bridge void *
#endif #endif
// Workaround for management of dispatch_retain() / dispatch_release() by ARC with iOS 6 / Mac OS X 10.8
#if (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && (!defined(__IPHONE_6_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0)) || \
(defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && (!defined(__MAC_10_8) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8))
#define AF_DISPATCH_RETAIN_RELEASE 1
#endif
NSSet * AFContentTypesFromHTTPHeader(NSString *string) { NSSet * AFContentTypesFromHTTPHeader(NSString *string) {
if (!string) { if (!string) {
return nil; return nil;
@ -117,14 +111,14 @@ static void AFSwizzleClassMethodWithClassAndSelectorUsingBlock(Class klass, SEL
- (void)dealloc { - (void)dealloc {
if (_successCallbackQueue) { if (_successCallbackQueue) {
#ifdef AF_DISPATCH_RETAIN_RELEASE #ifdef OS_OBJECT_USE_OBJC
dispatch_release(_successCallbackQueue); dispatch_release(_successCallbackQueue);
#endif #endif
_successCallbackQueue = NULL; _successCallbackQueue = NULL;
} }
if (_failureCallbackQueue) { if (_failureCallbackQueue) {
#ifdef AF_DISPATCH_RETAIN_RELEASE #ifdef OS_OBJECT_USE_OBJC
dispatch_release(_failureCallbackQueue); dispatch_release(_failureCallbackQueue);
#endif #endif
_failureCallbackQueue = NULL; _failureCallbackQueue = NULL;
@ -207,14 +201,14 @@ static void AFSwizzleClassMethodWithClassAndSelectorUsingBlock(Class klass, SEL
- (void)setSuccessCallbackQueue:(dispatch_queue_t)successCallbackQueue { - (void)setSuccessCallbackQueue:(dispatch_queue_t)successCallbackQueue {
if (successCallbackQueue != _successCallbackQueue) { if (successCallbackQueue != _successCallbackQueue) {
if (_successCallbackQueue) { if (_successCallbackQueue) {
#ifdef AF_DISPATCH_RETAIN_RELEASE #ifdef OS_OBJECT_USE_OBJC
dispatch_release(_successCallbackQueue); dispatch_release(_successCallbackQueue);
#endif #endif
_successCallbackQueue = NULL; _successCallbackQueue = NULL;
} }
if (successCallbackQueue) { if (successCallbackQueue) {
#ifdef AF_DISPATCH_RETAIN_RELEASE #ifdef OS_OBJECT_USE_OBJC
dispatch_retain(successCallbackQueue); dispatch_retain(successCallbackQueue);
#endif #endif
_successCallbackQueue = successCallbackQueue; _successCallbackQueue = successCallbackQueue;
@ -225,14 +219,14 @@ static void AFSwizzleClassMethodWithClassAndSelectorUsingBlock(Class klass, SEL
- (void)setFailureCallbackQueue:(dispatch_queue_t)failureCallbackQueue { - (void)setFailureCallbackQueue:(dispatch_queue_t)failureCallbackQueue {
if (failureCallbackQueue != _failureCallbackQueue) { if (failureCallbackQueue != _failureCallbackQueue) {
if (_failureCallbackQueue) { if (_failureCallbackQueue) {
#ifdef AF_DISPATCH_RETAIN_RELEASE #ifdef OS_OBJECT_USE_OBJC
dispatch_release(_failureCallbackQueue); dispatch_release(_failureCallbackQueue);
#endif #endif
_failureCallbackQueue = NULL; _failureCallbackQueue = NULL;
} }
if (failureCallbackQueue) { if (failureCallbackQueue) {
#ifdef AF_DISPATCH_RETAIN_RELEASE #ifdef OS_OBJECT_USE_OBJC
dispatch_retain(failureCallbackQueue); dispatch_retain(failureCallbackQueue);
#endif #endif
_failureCallbackQueue = failureCallbackQueue; _failureCallbackQueue = failureCallbackQueue;