From 010ef9b8bcd8d65af12510d380c8ee336e788086 Mon Sep 17 00:00:00 2001 From: John Scott Date: Fri, 5 Feb 2016 20:45:46 +0000 Subject: [PATCH 1/2] Added __kindof keyword where appropriate to avoid errors of the form "incompatible block pointer types sending 'GCDWebServerResponse *(^)(GCDWebServerDataRequest *__strong)' to parameter of type 'GCDWebServerProcessBlock' (aka 'GCDWebServerResponse *(^)(GCDWebServerRequest *__strong)')" --- GCDWebServer/Core/GCDWebServer.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/GCDWebServer/Core/GCDWebServer.h b/GCDWebServer/Core/GCDWebServer.h index b68f10c..3f174ea 100644 --- a/GCDWebServer/Core/GCDWebServer.h +++ b/GCDWebServer/Core/GCDWebServer.h @@ -52,7 +52,11 @@ typedef GCDWebServerRequest* (^GCDWebServerMatchBlock)(NSString* requestMethod, * recommended to return a GCDWebServerErrorResponse on error so more useful * information can be returned to the client. */ +#if __has_feature(objc_kindof) +typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(__kindof GCDWebServerRequest* request); +#else typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(GCDWebServerRequest* request); +#endif /** * The GCDWebServerAsynchronousProcessBlock works like the GCDWebServerProcessBlock @@ -65,7 +69,11 @@ typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(GCDWebServerRequest* r * useful information can be returned to the client. */ typedef void (^GCDWebServerCompletionBlock)(GCDWebServerResponse* response); +#if __has_feature(objc_kindof) +typedef void (^GCDWebServerAsyncProcessBlock)(__kindof GCDWebServerRequest* request, GCDWebServerCompletionBlock completionBlock); +#else typedef void (^GCDWebServerAsyncProcessBlock)(GCDWebServerRequest* request, GCDWebServerCompletionBlock completionBlock); +#endif /** * The port used by the GCDWebServer (NSNumber / NSUInteger). From 10a94e36fdcfa3d86a781b58bfbda1aab31d91e7 Mon Sep 17 00:00:00 2001 From: John Scott Date: Sat, 6 Feb 2016 12:18:49 +0000 Subject: [PATCH 2/2] Removed guards around __kindof usage as the project is Xcode 7 only. --- GCDWebServer/Core/GCDWebServer.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/GCDWebServer/Core/GCDWebServer.h b/GCDWebServer/Core/GCDWebServer.h index 3f174ea..b4afb4c 100644 --- a/GCDWebServer/Core/GCDWebServer.h +++ b/GCDWebServer/Core/GCDWebServer.h @@ -52,11 +52,7 @@ typedef GCDWebServerRequest* (^GCDWebServerMatchBlock)(NSString* requestMethod, * recommended to return a GCDWebServerErrorResponse on error so more useful * information can be returned to the client. */ -#if __has_feature(objc_kindof) typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(__kindof GCDWebServerRequest* request); -#else -typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(GCDWebServerRequest* request); -#endif /** * The GCDWebServerAsynchronousProcessBlock works like the GCDWebServerProcessBlock @@ -69,11 +65,7 @@ typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(GCDWebServerRequest* r * useful information can be returned to the client. */ typedef void (^GCDWebServerCompletionBlock)(GCDWebServerResponse* response); -#if __has_feature(objc_kindof) typedef void (^GCDWebServerAsyncProcessBlock)(__kindof GCDWebServerRequest* request, GCDWebServerCompletionBlock completionBlock); -#else -typedef void (^GCDWebServerAsyncProcessBlock)(GCDWebServerRequest* request, GCDWebServerCompletionBlock completionBlock); -#endif /** * The port used by the GCDWebServer (NSNumber / NSUInteger).