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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit d83ced86c3ce8c1accde9f9e9bff7d9f3e8fe5a9
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Apr 24 23:53:25 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Apr 24 23:47:25 2020 +0200

    I think "us" is supposed to be the current thread id
    
    The current thread's id is returned by std::this_thread::get_id().
    std::thread::id() (the result of the std::thead::id constructor), on
    the other hand, does not represent any thread.
    
    Change-Id: I13f2831810282109d7bce984f1d040595c466712
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92881
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 2c94601ee..5966b1047 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -571,7 +571,7 @@ public:
     {
         if (InhibitThreadChecks)
             return;
-        std::thread::id us = std::thread::id();
+        std::thread::id us = std::this_thread::get_id();
         if (_owner == us)
             return; // all well
         LOG_DBG("Ununusual - SocketPoll used from a new thread");