From e2acbe8499fdf9944bf8663fbd30bdd96834f970 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Mon, 13 May 2019 22:16:49 -0700 Subject: [PATCH] Revert "Revert "fix cast warning caught on windows"" This reverts commit 25eaf730bc93478393dea57b17b32cda0a9b6a60. --- ixwebsocket/IXSocket.cpp | 2 +- ixwebsocket/IXSocket.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ixwebsocket/IXSocket.cpp b/ixwebsocket/IXSocket.cpp index e2794229..e855f125 100644 --- a/ixwebsocket/IXSocket.cpp +++ b/ixwebsocket/IXSocket.cpp @@ -129,7 +129,7 @@ namespace ix } // Wake up from poll/select by writing to the pipe which is watched by select - bool Socket::wakeUpFromPoll(uint8_t wakeUpCode) + bool Socket::wakeUpFromPoll(uint64_t wakeUpCode) { return _selectInterrupt->notify(wakeUpCode); } diff --git a/ixwebsocket/IXSocket.h b/ixwebsocket/IXSocket.h index 288ac4d2..e2c0da5e 100644 --- a/ixwebsocket/IXSocket.h +++ b/ixwebsocket/IXSocket.h @@ -57,7 +57,7 @@ namespace ix // Functions to check whether there is activity on the socket PollResultType poll(int timeoutMs = kDefaultPollTimeout); - bool wakeUpFromPoll(uint8_t wakeUpCode); + bool wakeUpFromPoll(uint64_t wakeUpCode); PollResultType isReadyToWrite(int timeoutMs); PollResultType isReadyToRead(int timeoutMs);