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

[Miklos Vajna]

 net/Socket.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f375a9d5de400b0da00b7065eac8927ab8ed891e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Sep 18 10:15:49 2017 +0200

    Socket: mark setNoDelay() as non-virtual
    
    No derived classes override it, and if they would, that would be a
    problem, as setNoDelay() is called from init(), which is called from the
    Socket ctor. Calling virtual functions from the base class ctor is not a
    good idea, since the object is not fully constructed yet.
    
    Change-Id: I4993e26d09f5d3429c7e2afae7688b84c0061c9d

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 3442fdb1..62a743b5 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -135,7 +135,7 @@ public:
                             int events) = 0;
 
     /// manage latency issues around packet aggregation
-    virtual void setNoDelay()
+    void setNoDelay()
     {
         const int val = 1;
         ::setsockopt(_fd, IPPROTO_TCP, TCP_NODELAY,