[Libreoffice-commits] online.git: loolwsd/ChildSession.cpp loolwsd/Common.hpp

[Miklos Vajna]

 loolwsd/ChildSession.cpp |    1 -
 loolwsd/Common.hpp       |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 40340063389fe9558c3bdf15258950d9acfb5820
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Nov 4 14:09:09 2016 +0100

    getNewChild: avoid multiplication at int precision, then compare with long
    
    Change-Id: I23c26ef9014150fda7e400e19526244ddaa411cf

diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 6603433..7cfb7ee 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -25,7 +25,6 @@
 
 using Poco::JSON::Object;
 using Poco::JSON::Parser;
-using Poco::Net::WebSocket;
 using Poco::StringTokenizer;
 using Poco::Timestamp;
 using Poco::URI;
diff --git a/loolwsd/Common.hpp b/loolwsd/Common.hpp
index 13028b7..cfe0e2d 100644
--- a/loolwsd/Common.hpp
+++ b/loolwsd/Common.hpp
@@ -18,7 +18,7 @@ constexpr int DEFAULT_CLIENT_PORT_NUMBER = 9980;
 constexpr int DEFAULT_MASTER_PORT_NUMBER = 9981;
 
 constexpr int COMMAND_TIMEOUT_MS = 5000;
-constexpr int CHILD_TIMEOUT_MS = COMMAND_TIMEOUT_MS;
+constexpr long CHILD_TIMEOUT_MS = COMMAND_TIMEOUT_MS;
 constexpr int CHILD_REBALANCE_INTERVAL_MS = CHILD_TIMEOUT_MS / 10;
 constexpr int POLL_TIMEOUT_MS = COMMAND_TIMEOUT_MS / 10;
 constexpr int WS_SEND_TIMEOUT_MS = 1000;