net/Socket.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b31474690a6121e851c08124ec3243909d0b9ede
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 7 09:39:52 2017 +0200
net: Socket::assertCorrectThread() can be non-virtual
None of the subclasses override it, and if they would, it would be
problematic, since e.g. the StreamSocket dtor calls it (and virtual
calls during dtors are a problem).
Change-Id: Ie0891349808a81539078fd1f2d95a55a4ce5107a
diff --git a/net/Socket.hpp b/net/Socket.hpp
index c726f337..3b44e803 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -193,7 +193,7 @@ public:
}
/// Asserts in the debug builds, otherwise just logs.
- virtual void assertCorrectThread()
+ void assertCorrectThread()
{
if (InhibitThreadChecks)
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
