From 184b97ef8c1b0308468ea6b6da2c8451bad5d925 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 10 Aug 2015 06:21:29 +0200 Subject: [PATCH] fix merge issues Signed-off-by: Lukas Schmidt --- SocketIOClientSwift/SocketIOClient.swift | 2 +- SocketIOClientSwift/SocketTypes.swift | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift index 3707968..ad37d8d 100644 --- a/SocketIOClientSwift/SocketIOClient.swift +++ b/SocketIOClientSwift/SocketIOClient.swift @@ -352,7 +352,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient for handler in handlers where handler.event == event { if let ack = ack { dispatch_async(handleQueue) {[weak self] in - handler.executeCallback(data, withAck: ack!, withSocket: self) + handler.executeCallback(data, withAck: ack, withSocket: self) } } else { dispatch_async(handleQueue) { diff --git a/SocketIOClientSwift/SocketTypes.swift b/SocketIOClientSwift/SocketTypes.swift index f938e20..8ced279 100644 --- a/SocketIOClientSwift/SocketTypes.swift +++ b/SocketIOClientSwift/SocketTypes.swift @@ -27,6 +27,7 @@ import Foundation public typealias AckCallback = (NSArray?) -> Void public typealias AckEmitter = (AnyObject...) -> Void public typealias AckEmitterObjectiveC = (NSArray) -> Void +public typealias NormalCallback = (NSArray?, AckEmitter?) -> Void public typealias NormalCallbackObjectiveC = (NSArray?, AckEmitterObjectiveC?) -> Void public typealias OnAckCallback = (timeoutAfter:UInt64, callback:AckCallback) -> Void