strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

'static const int' needs an explicit definition in C++11

Browse source 
core.git equivalent situation is e.g. SwXMLTableContext::MAX_WIDTH.

Change-Id: Id6f4201e875a7453ab2363161ea9560ae6e40384
This commit is contained in:
Miklos Vajna 2018-02-26 16:30:30 +01:00
parent 56fd92b4eb
commit e5c7c62713
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/Socket.cpp
View file

@ -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 ")

4
net/WebSocketHandler.hpp
View file

@ -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() :

3
wsd/Admin.cpp
View file

@ -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)

4
wsd/Admin.hpp
View file

@ -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