From 572a21705014610f561eceb35fba1688a952475d Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Mon, 18 Mar 2019 14:31:21 -0700 Subject: [PATCH] no default parameters for isReadyToWrite and isReadyToRead --- ixwebsocket/IXSocket.cpp | 2 +- ixwebsocket/IXSocket.h | 4 ++-- ixwebsocket/IXWebSocketTransport.cpp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ixwebsocket/IXSocket.cpp b/ixwebsocket/IXSocket.cpp index 2329d67a..7ca03bc8 100644 --- a/ixwebsocket/IXSocket.cpp +++ b/ixwebsocket/IXSocket.cpp @@ -49,7 +49,7 @@ namespace ix return; } - PollResultType pollResult = isReadyToRead(timeoutSecs); + PollResultType pollResult = isReadyToRead(timeoutSecs, 0); if (onPollCallback) onPollCallback(pollResult); } diff --git a/ixwebsocket/IXSocket.h b/ixwebsocket/IXSocket.h index 01c486b3..e7bab660 100644 --- a/ixwebsocket/IXSocket.h +++ b/ixwebsocket/IXSocket.h @@ -51,8 +51,8 @@ namespace ix bool wakeUpFromPoll(uint8_t wakeUpCode); PollResultType select(bool readyToRead, int timeoutSecs, int timeoutMs); - PollResultType isReadyToWrite(int timeoutSecs, int timeoutMs = 0); - PollResultType isReadyToRead(int timeoutSecs, int timeoutMs = 0); + PollResultType isReadyToWrite(int timeoutSecs, int timeoutMs); + PollResultType isReadyToRead(int timeoutSecs, int timeoutMs); // Virtual methods virtual bool connect(const std::string& url, diff --git a/ixwebsocket/IXWebSocketTransport.cpp b/ixwebsocket/IXWebSocketTransport.cpp index 4d5e7ab9..6f74cd07 100644 --- a/ixwebsocket/IXWebSocketTransport.cpp +++ b/ixwebsocket/IXWebSocketTransport.cpp @@ -204,7 +204,6 @@ namespace ix { // Wait with a 10ms timeout until the socket is ready to write. // This way we are not busy looping - int timeoutMs = 10; PollResultType result = _socket->isReadyToWrite(0, 10); if (result == PollResultType_Error) {