[Libreoffice-commits] online.git: net/WebSocketHandler.hpp

Miklos Vajna vmiklos at collabora.co.uk
Fri Mar 10 10:07:13 UTC 2017


 net/WebSocketHandler.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 400c580800799894f9ee195eba50f9c37be8377c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Mar 10 11:06:43 2017 +0100

    net: fix -Werror,-Wconstant-conversion
    
    Change-Id: If2bbad6d3909c7d6df9eed5edf260609d64db3a8

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 5331005..27536a5 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -250,7 +250,7 @@ public:
         {
             const std::string nextmessage = "nextmessage: size=" + std::to_string(len);
             const unsigned char size = (nextmessage.size() & 0xff);
-            out.push_back(fin | WSOpCode::Text);
+            out.push_back(static_cast<char>(fin | WSOpCode::Text));
             out.push_back(size);
             out.insert(out.end(), nextmessage.data(), nextmessage.data() + size);
             socket->writeOutgoingData();


More information about the Libreoffice-commits mailing list