wsd/LOOLWSD.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit dcc0dc441eeaf443a4f05cec3d9ba9e189bff918 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> Date: Tue Jan 10 10:32:16 2017 -0500 wsd: headers and formatting Change-Id: I2bd62379cf1008a809638354b618bd2383a316c2 Reviewed-on: https://gerrit.libreoffice.org/33112 Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> Tested-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 7976b97..4081966 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -103,20 +103,20 @@ #include "DocumentBroker.hpp" #include "Exceptions.hpp" #include "FileServer.hpp" -#include "common/FileUtil.hpp" #include "IoUtil.hpp" -#include "Protocol.hpp" -#include "Session.hpp" -#include <LOOLWebSocket.hpp> #include "Log.hpp" #include "PrisonerSession.hpp" +#include "Protocol.hpp" #include "QueueHandler.hpp" +#include "Session.hpp" #include "Storage.hpp" #include "TraceFile.hpp" #include "Unit.hpp" #include "UnitHTTP.hpp" #include "UserMessages.hpp" #include "Util.hpp" +#include "common/FileUtil.hpp" +#include <LOOLWebSocket.hpp> #include "common/SigUtil.hpp" @@ -172,16 +172,16 @@ int MasterPortNumber = DEFAULT_MASTER_PORT_NUMBER; /// New LOK child processes ready to host documents. //TODO: Move to a more sensible namespace. static bool DisplayVersion = false; -static std::vector<std::shared_ptr<ChildProcess>> NewChildren; +static std::vector<std::shared_ptr<ChildProcess> > NewChildren; static std::mutex NewChildrenMutex; static std::condition_variable NewChildrenCV; static std::chrono::steady_clock::time_point LastForkRequestTime = std::chrono::steady_clock::now(); static std::atomic<int> OutstandingForks(1); // Forkit always spawns 1. -static std::map<std::string, std::shared_ptr<DocumentBroker>> DocBrokers; +static std::map<std::string, std::shared_ptr<DocumentBroker> > DocBrokers; static std::mutex DocBrokersMutex; /// Used when shutting down to notify them all that the server is recycling. -static std::vector<std::shared_ptr<LOOLWebSocket>> ClientWebSockets; +static std::vector<std::shared_ptr<LOOLWebSocket> > ClientWebSockets; static std::mutex ClientWebSocketsMutex; #if ENABLE_DEBUG _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits