From beb08eb751fa8e1f72042f263316ab5e5ddb596d Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Wed, 10 Nov 2021 00:54:13 -0500
Subject: New upstream version 2.4.0+dfsg.

---
 src/lib/net/SocketMultiplexer.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/lib/net/SocketMultiplexer.cpp')

diff --git a/src/lib/net/SocketMultiplexer.cpp b/src/lib/net/SocketMultiplexer.cpp
index cdb9039..5a2328e 100644
--- a/src/lib/net/SocketMultiplexer.cpp
+++ b/src/lib/net/SocketMultiplexer.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -26,7 +26,6 @@
 #include "arch/Arch.h"
 #include "arch/XArch.h"
 #include "base/Log.h"
-#include "base/TMethodJob.h"
 #include "common/stdvector.h"
 
 //
@@ -58,8 +57,7 @@ SocketMultiplexer::SocketMultiplexer() :
     m_jobListLockLocker(NULL)
 {
     // start thread
-    m_thread = new Thread(new TMethodJob<SocketMultiplexer>(
-                                this, &SocketMultiplexer::serviceThread));
+    m_thread = new Thread([this](){ service_thread(); });
 }
 
 SocketMultiplexer::~SocketMultiplexer()
@@ -95,7 +93,7 @@ void SocketMultiplexer::addSocket(ISocket* socket, std::unique_ptr<ISocketMultip
     if (i == m_socketJobMap.end()) {
         // we *must* put the job at the end so the order of jobs in
         // the list continue to match the order of jobs in pfds in
-        // serviceThread().
+        // service_thread().
         JobCursor j = m_socketJobs.insert(m_socketJobs.end(), std::move(job));
         m_update     = true;
         m_socketJobMap.insert(std::make_pair(socket, j));
@@ -125,7 +123,7 @@ SocketMultiplexer::removeSocket(ISocket* socket)
 
     // remove job.  rather than removing it from the map we put NULL
     // in the list instead so the order of jobs in the list continues
-    // to match the order of jobs in pfds in serviceThread().
+    // to match the order of jobs in pfds in service_thread().
     SocketJobMap::iterator i = m_socketJobMap.find(socket);
     if (i != m_socketJobMap.end()) {
         if (*(i->second)) {
@@ -138,8 +136,7 @@ SocketMultiplexer::removeSocket(ISocket* socket)
     unlockJobList();
 }
 
-void
-SocketMultiplexer::serviceThread(void*)
+void SocketMultiplexer::service_thread()
 {
     std::vector<IArchNetwork::PollEntry> pfds;
     IArchNetwork::PollEntry pfd;
@@ -179,7 +176,7 @@ SocketMultiplexer::serviceThread(void*)
                         pfd.m_events |= IArchNetwork::kPOLLOUT;
                     }
                     pfds.push_back(pfd);
-                }                
+                }
                 jobCursor = nextCursor(cursor);
             }
             deleteCursor(cursor);
-- 
cgit v1.2.3