From d9e235e0331a7831c985fe2117e8ef86d64f5aee Mon Sep 17 00:00:00 2001 From: Pierre-Michel Villa Date: Wed, 6 Dec 2017 10:12:40 +0100 Subject: [PATCH] fixed iOS 10+ compatibility and warnings on logs --- BPXLUUIDHandler.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BPXLUUIDHandler.m b/BPXLUUIDHandler.m index 0de8709..2566a99 100644 --- a/BPXLUUIDHandler.m +++ b/BPXLUUIDHandler.m @@ -110,7 +110,7 @@ + (NSString *)generateUUID CFRelease(uuidRef); NSString *uuid; IF_ARC( - uuid = objc_retainedObject(uuidStringRef); + uuid = (__bridge NSString *)uuidStringRef; , uuid = [(NSString *)uuidStringRef autorelease]; ) @@ -148,7 +148,7 @@ + (NSString *)storeUUID:(BOOL)itemExists if (status != noErr) { - NSLog(@"BPXLUUIDHandler Keychain Save Error: %ld", status); + NSLog(@"BPXLUUIDHandler Keychain Save Error: %ld", (long)status); uuid = nil; } @@ -182,7 +182,7 @@ + (NSString *)UUID } else // Any other error, log it and return nil { - NSLog(@"BPXLUUIDHandler Unhandled Keychain Error %ld", status); + NSLog(@"BPXLUUIDHandler Unhandled Keychain Error %ld", (long)status); return nil; } } @@ -202,7 +202,7 @@ + (NSString *)UUID } else // Any other error, log it and return nil { - NSLog(@"BPXLUUIDHandler Unhandled Keychain Error %ld", status); + NSLog(@"BPXLUUIDHandler Unhandled Keychain Error %ld", (long)status); return nil; } } @@ -210,7 +210,7 @@ + (NSString *)UUID if (resultData != NULL) { IF_ARC( - _uuid = [[NSString alloc] initWithData:objc_retainedObject(resultData) encoding:NSUTF8StringEncoding]; + _uuid = [[NSString alloc] initWithData:(__bridge NSData * _Nonnull)resultData encoding:NSUTF8StringEncoding]; , _uuid = [[NSString alloc] initWithData:(NSData *)resultData encoding:NSUTF8StringEncoding]; CFRelease(resultData); @@ -246,7 +246,7 @@ + (void)reset status = SecItemDelete(query); if (status != noErr) { - NSLog(@"BPXLUUIDHandler Keychain Delete Error: %ld", status); + NSLog(@"BPXLUUIDHandler Keychain Delete Error: %ld", (long)status); } CFRelease(query); }