wsd/AdminModel.cpp | 2 +- wsd/AdminModel.hpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-)
New commits: commit 8568f476670151ba404c0d7dd8fce562619edf9c Author: Miklos Vajna <[email protected]> Date: Fri Nov 10 09:41:33 2017 +0100 wsd: fix -Werror,-Wunused-private-field Change-Id: I4522caa338d874628509f4382914b39406797da5 diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp index 8b8f31a7..b3d67f7a 100644 --- a/wsd/AdminModel.cpp +++ b/wsd/AdminModel.cpp @@ -312,7 +312,7 @@ void AdminModel::subscribe(int sessionId, const std::weak_ptr<WebSocketHandler>& { assertCorrectThread(); - const auto ret = _subscribers.emplace(sessionId, Subscriber(sessionId, ws)); + const auto ret = _subscribers.emplace(sessionId, Subscriber(ws)); if (!ret.second) { LOG_WRN("Subscriber already exists"); diff --git a/wsd/AdminModel.hpp b/wsd/AdminModel.hpp index 4799ec4a..2bba6ab6 100644 --- a/wsd/AdminModel.hpp +++ b/wsd/AdminModel.hpp @@ -166,9 +166,8 @@ private: class Subscriber { public: - Subscriber(int sessionId, const std::weak_ptr<WebSocketHandler>& ws) - : _sessionId(sessionId), - _ws(ws), + Subscriber(const std::weak_ptr<WebSocketHandler>& ws) + : _ws(ws), _start(std::time(nullptr)) { LOG_INF("Subscriber ctor."); @@ -190,9 +189,6 @@ public: bool isExpired() const { return _end != 0 && std::time(nullptr) >= _end; } private: - /// Admin session Id - int _sessionId; - /// The underlying AdminRequestHandler std::weak_ptr<WebSocketHandler> _ws; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
