[Libreoffice-commits] online.git: net/SslSocket.hpp

Miklos Vajna vmiklos at collabora.co.uk
Fri Mar 10 10:12:48 UTC 2017


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

New commits:
commit 2f07eb9a7ded3cd75fd25fea741eade13cb44b0a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Mar 10 11:11:58 2017 +0100

    Fix remaining -Werror,-Winconsistent-missing-override warnings
    
    The last ones introduced by the non-blocking merge.
    
    Change-Id: I0b9264428669cdd2b8f6eac911c336c6b0e8de99

diff --git a/net/SslSocket.hpp b/net/SslSocket.hpp
index ac96973..1253b9f 100644
--- a/net/SslSocket.hpp
+++ b/net/SslSocket.hpp
@@ -100,14 +100,14 @@ public:
         StreamSocket::writeOutgoingData();
     }
 
-    virtual int readData(char* buf, int len)
+    virtual int readData(char* buf, int len) override
     {
         assert(isCorrectThread());
 
         return handleSslState(SSL_read(_ssl, buf, len));
     }
 
-    virtual int writeData(const char* buf, const int len)
+    virtual int writeData(const char* buf, const int len) override
     {
         assert(isCorrectThread());
 


More information about the Libreoffice-commits mailing list