[Libreoffice-commits] online.git: Branch 'feature/proxyhack' - wsd/ProxyProtocol.hpp

[Jan Holesovsky (via logerrit)]

 wsd/ProxyProtocol.hpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42efe8e57ec6318210635be183f2d75ca58e0c86
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Apr 20 16:22:37 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Apr 20 16:22:37 2020 +0200

    Fix build with clang.
    
    Change-Id: I64126238c64069000a11ad9b219d3f72ab7b3719

diff --git a/wsd/ProxyProtocol.hpp b/wsd/ProxyProtocol.hpp
index 30ef2dacf..7bca66600 100644
--- a/wsd/ProxyProtocol.hpp
+++ b/wsd/ProxyProtocol.hpp
@@ -53,13 +53,13 @@ public:
 
 public:
     /// Clear all external references
-    virtual void dispose() { _msgHandler.reset(); }
+    void dispose() override { _msgHandler.reset(); }
 
     int sendTextMessage(const char *msg, const size_t len, bool flush = false) const override;
     int sendBinaryMessage(const char *data, const size_t len, bool flush = false) const override;
     void shutdown(bool goingAway = false, const std::string &statusMessage = "") override;
     void getIOStats(uint64_t &sent, uint64_t &recv) override;
-    void dumpState(std::ostream& os);
+    void dumpState(std::ostream& os) override;
     bool parseEmitIncoming(const std::shared_ptr<StreamSocket> &socket);
     void handleRequest(bool isWaiting, const std::shared_ptr<Socket> &socket);