net/Socket.cpp | 3 ---
net/WebSocketHandler.hpp | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 195b88ac8dab2c682fb22cbc396a02a27fecb465
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Mon Sep 10 16:10:53 2018 +0300
Commit: Tor Lillqvist <t...@iki.fi>
CommitDate: Mon Sep 10 16:10:53 2018 +0300
Just define these static const int members in-class
diff --git a/net/Socket.cpp b/net/Socket.cpp
index 38bacdde8..237674419 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -256,9 +256,6 @@ void SocketDisposition::execute()
#endif
-const int WebSocketHandler::InitialPingDelayMs = 25;
-const int WebSocketHandler::PingFrequencyMs = 18 * 1000;
-
void WebSocketHandler::dumpState(std::ostream& os)
{
os << (_shuttingDown ? "shutd " : "alive ")
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 3e1faabb4..7e6befa15 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -44,8 +44,8 @@ protected:
static const unsigned char Mask = 0x80;
};
- static const int InitialPingDelayMs;
- static const int PingFrequencyMs;
+ static const int InitialPingDelayMs = 25;
+ static const int PingFrequencyMs = 18 * 1000;
public:
/// Perform upgrade ourselves, or select a client web socket.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
