loolwsd/ChildProcessSession.cpp | 1 - loolwsd/ChildProcessSession.hpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit 713cf3c067e0ff90a9a285ca228fee9cc52ceb1b Author: Ashod Nakashian <[email protected]> Date: Sun May 1 20:28:54 2016 -0400 loolwsd: return static data via static members Change-Id: I083cdc921062ef518c9b39bae219caba6c99ee60 Reviewed-on: https://gerrit.libreoffice.org/24576 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp index a912798..bf9b8d2 100644 --- a/loolwsd/ChildProcessSession.cpp +++ b/loolwsd/ChildProcessSession.cpp @@ -725,7 +725,6 @@ namespace { } } - void ChildProcessSession::sendTile(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens) { int part, width, height, tilePosX, tilePosY, tileWidth, tileHeight; diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp index 77710fe..6f295ab 100644 --- a/loolwsd/ChildProcessSession.hpp +++ b/loolwsd/ChildProcessSession.hpp @@ -60,7 +60,7 @@ public: void loKitCallback(const int nType, const char* pPayload); - std::unique_lock<std::recursive_mutex> getLock() { return std::unique_lock<std::recursive_mutex>(Mutex); } + static std::unique_lock<std::recursive_mutex> getLock() { return std::unique_lock<std::recursive_mutex>(Mutex); } void setDocState(const int type, const std::string& payload) { _lastDocStates[type] = payload; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
