[Libreoffice-commits] online.git: wsd/LOOLWebSocket.hpp

[Miklos Vajna]

 wsd/LOOLWebSocket.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c978b035936019e82b04f10df9fce63372aa4e1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jan 16 12:48:59 2017 +0100

    wsd: these enum values are intentionally from different enum types
    
    Which is dangerous in general, but here the values are from
    non-overlapping ranges. Make it a bit more explicit that this is not an
    accident.
    
    Change-Id: I56897473a755e28cd9e7f74ceacecbab2db5e829

diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
index 81ced3a..850560e 100644
--- a/wsd/LOOLWebSocket.hpp
+++ b/wsd/LOOLWebSocket.hpp
@@ -126,7 +126,7 @@ public:
             if ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_PING)
             {
                 // Echo back the ping message.
-                if (Poco::Net::WebSocket::sendFrame(buffer, n, WebSocket::FRAME_FLAG_FIN | WebSocket::FRAME_OP_PONG) != n)
+                if (Poco::Net::WebSocket::sendFrame(buffer, n, static_cast<int>(WebSocket::FRAME_FLAG_FIN) | WebSocket::FRAME_OP_PONG) != n)
                 {
                     LOG_WRN("Sending Pong failed.");
                     return -1;