net/Socket.hpp | 2 +- net/SslSocket.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 2ad3cd4de169625f89911953f7311f157b6ee26d Author: Ashod Nakashian <[email protected]> Date: Sun Apr 9 16:33:28 2017 -0400 wsd: don't call virtuals in dtors Change-Id: I2490e2f63dc20cf6b3fa0be45341b041e3ccb1bf Reviewed-on: https://gerrit.libreoffice.org/36321 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/net/Socket.hpp b/net/Socket.hpp index 754c4d12..d35e8810 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -646,7 +646,7 @@ public: if (!_shutdownSignalled) { _shutdownSignalled = true; - closeConnection(); + StreamSocket::closeConnection(); } } diff --git a/net/SslSocket.hpp b/net/SslSocket.hpp index 2e495883..4b5d1323 100644 --- a/net/SslSocket.hpp +++ b/net/SslSocket.hpp @@ -16,7 +16,7 @@ #include "Socket.hpp" /// An SSL/TSL, non-blocking, data streaming socket. -class SslStreamSocket : public StreamSocket +class SslStreamSocket final : public StreamSocket { public: SslStreamSocket(const int fd, std::shared_ptr<SocketHandlerInterface> responseClient) : @@ -55,7 +55,7 @@ public: if (!_shutdownSignalled) { _shutdownSignalled = true; - closeConnection(); + SslStreamSocket::closeConnection(); } SSL_free(_ssl); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
