From 3001ef208a6ebd3eceed146b45ea5652d6993a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Expo=CC=81sito?= Date: Sat, 23 Jun 2012 15:16:25 +0200 Subject: [PATCH] Added support for compile with or without ARC --- OpenUDID.m | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/OpenUDID.m b/OpenUDID.m index cf31d49..e1d9556 100644 --- a/OpenUDID.m +++ b/OpenUDID.m @@ -35,13 +35,6 @@ 3. This notice may not be removed or altered from any source distribution. */ - -#if __has_feature(objc_arc) -#error This file uses the classic non-ARC retain/release model; hints below... - // to selectively compile this file as non-ARC, do as follows: - // https://img.skitch.com/20120411-bcku69k1uw528cwh9frh5px8ya.png -#endif - #import "OpenUDID.h" #import // Need to import for CC_MD5 access #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR @@ -186,7 +179,11 @@ + (NSString*) valueWithError:(NSError **)error { { // generate a new uuid and store it in user defaults CFUUIDRef uuid = CFUUIDCreate(NULL); - appUID = (NSString *) CFUUIDCreateString(NULL, uuid); +#if __has_feature(objc_arc) + appUID = (__bridge NSString *) CFUUIDCreateString(NULL, uuid); +#else + appUID = (NSString *) CFUUIDCreateString(NULL, uuid); +#endif CFRelease(uuid); } @@ -328,8 +325,12 @@ + (NSString*) valueWithError:(NSError **)error { if (error!=nil) *error = [NSError errorWithDomain:kOpenUDIDDomain code:kOpenUDIDErrorOptedOut userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Application with unique id %@ is opted-out from OpenUDID as of %@",appUID,optedOutDate],@"description", nil]]; - + +#if __has_feature(objc_arc) + kOpenUDIDSessionCache = [NSString stringWithFormat:@"%040x",0]; +#else kOpenUDIDSessionCache = [[NSString stringWithFormat:@"%040x",0] retain]; +#endif return kOpenUDIDSessionCache; } @@ -345,7 +346,12 @@ + (NSString*) valueWithError:(NSError **)error { code:kOpenUDIDErrorNone userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"OpenUDID succesfully retrieved",@"description", nil]]; } +#if __has_feature(objc_arc) + kOpenUDIDSessionCache = openUDID; +#else kOpenUDIDSessionCache = [openUDID retain]; +#endif + return kOpenUDIDSessionCache; }