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

[Miklos Vajna (via logerrit)]

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

New commits:
commit 330cfb1f0d9ec8455f59785b69b0c2b6c2862495
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Sep 10 09:17:44 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Sep 10 14:23:22 2020 +0200

    net: mark SocketPoll dtor as virtual
    
    Because Admin derives from it, and UnitPHPProxy holds a
    shared_ptr<SocketPoll>, so the non-virtual dtor was invoked for a class
    whcih is not (and can't be) final.
    
    Found by clang's -Werror,-Wdelete-non-abstract-non-virtual-dtor.
    
    Change-Id: I9b31bb58e79b2da3a3896789c52258f315fdd3d6
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102355
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/net/Socket.hpp b/net/Socket.hpp
index ce80d2253..7ec78f00a 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -513,7 +513,7 @@ class SocketPoll
 public:
     /// Create a socket poll, called rather infrequently.
     SocketPoll(const std::string& threadName);
-    ~SocketPoll();
+    virtual ~SocketPoll();
 
     /// Default poll time - useful to increase for debugging.
     static int DefaultPollTimeoutMicroS;