net/Socket.hpp | 2 +- wsd/LOOLWSD.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 33cbe908c5d8b82e181fd73d59de4672ccad540e Author: Miklos Vajna <[email protected]> Date: Fri Mar 10 10:54:08 2017 +0100 net: fix -Werror,-Winconsistent-missing-override Change-Id: Ia8c1f0233e0b65f5fae01272b4f31638aceac9ee diff --git a/net/Socket.hpp b/net/Socket.hpp index 7c48bfc..7b3199b 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -521,7 +521,7 @@ public: } /// Just trigger the async shutdown. - virtual void shutdown() + virtual void shutdown() override { _shutdownSignalled = true; } commit 2e2381b5b3fc33c4bd680136c7210694ce58119c Author: Miklos Vajna <[email protected]> Date: Fri Mar 10 10:53:40 2017 +0100 wsd: fix -Werror,-Winconsistent-missing-override Change-Id: I0f009aea715e93c90683f333c96a04088d103964 diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 4608c5a..589d0b6 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1628,7 +1628,7 @@ private: } /// Prisoner websocket fun ... (for now) - virtual void handleMessage(bool /*fin*/, WSOpCode /* code */, std::vector<char> &data) + virtual void handleMessage(bool /*fin*/, WSOpCode /* code */, std::vector<char> &data) override { if (UnitWSD::get().filterChildMessage(data)) return; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
