net/Socket.cpp | 3 +++ net/WebSocketHandler.hpp | 4 ++-- wsd/Admin.cpp | 3 +++ wsd/Admin.hpp | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-)
New commits: commit e5c7c62713b399526f7fafd85c1f02c9a2a5f45f Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon Feb 26 16:30:30 2018 +0100 'static const int' needs an explicit definition in C++11 core.git equivalent situation is e.g. SwXMLTableContext::MAX_WIDTH. Change-Id: Id6f4201e875a7453ab2363161ea9560ae6e40384 diff --git a/net/Socket.cpp b/net/Socket.cpp index 31ad77c6..1bf847cb 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -143,6 +143,9 @@ void SocketDisposition::execute() _socketMove = nullptr; } +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 d981ab4d..b363364f 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -40,8 +40,8 @@ protected: static const unsigned char Mask = 0x80; }; - static const int InitialPingDelayMs = 25; - static const int PingFrequencyMs = 18 * 1000; + static const int InitialPingDelayMs; + static const int PingFrequencyMs; public: WebSocketHandler() : diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp index 8add6956..41407d07 100644 --- a/wsd/Admin.cpp +++ b/wsd/Admin.cpp @@ -44,6 +44,9 @@ using Poco::Net::HTTPResponse; using Poco::StringTokenizer; using Poco::Util::Application; +const int Admin::MinStatsIntervalMs = 50; +const int Admin::DefStatsIntervalMs = 2500; + /// Process incoming websocket messages void AdminSocketHandler::handleMessage(bool /* fin */, WSOpCode /* code */, std::vector<char> &payload) diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp index e3386952..57197940 100644 --- a/wsd/Admin.hpp +++ b/wsd/Admin.hpp @@ -153,8 +153,8 @@ private: DocProcSettings _defDocProcSettings; // Don't update any more frequently than this since it's excessive. - static const int MinStatsIntervalMs = 50; - static const int DefStatsIntervalMs = 2500; + static const int MinStatsIntervalMs; + static const int DefStatsIntervalMs; }; #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits