diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2018-02-07 18:33:20 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2018-02-08 14:35:29 -0500 |
| commit | 08272671d2218eb69589a0639cbb61ef7cde3004 (patch) | |
| tree | ab4d629613d83d75ae35a25dcd9d6ff7c22a27f2 | |
| parent | ba917249486310985a34a5250bb570ca18821322 (diff) | |
boost: drop boost threads from torcontrol
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/torcontrol.cpp | 6 | ||||
| -rw-r--r-- | src/torcontrol.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index 9524da93cd..9f61989a26 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1665,7 +1665,7 @@ bool AppInitMain() LogPrintf("nBestHeight = %d\n", chain_active_height); if (gArgs.GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION)) - StartTorControl(threadGroup, scheduler); + StartTorControl(); Discover(); diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index d875008ef2..717d1cf7e5 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -731,7 +731,7 @@ void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg) /****** Thread ********/ static struct event_base *gBase; -static boost::thread torControlThread; +static std::thread torControlThread; static void TorControlThread() { @@ -740,7 +740,7 @@ static void TorControlThread() event_base_dispatch(gBase); } -void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler) +void StartTorControl() { assert(!gBase); #ifdef WIN32 @@ -754,7 +754,7 @@ void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler) return; } - torControlThread = boost::thread(boost::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread)); + torControlThread = std::thread(std::bind(&TraceThread<void (*)()>, "torcontrol", &TorControlThread)); } void InterruptTorControl() diff --git a/src/torcontrol.h b/src/torcontrol.h index 20514f7bbf..2be6701fa5 100644 --- a/src/torcontrol.h +++ b/src/torcontrol.h @@ -13,7 +13,7 @@ extern const std::string DEFAULT_TOR_CONTROL; static const bool DEFAULT_LISTEN_ONION = true; -void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler); +void StartTorControl(); void InterruptTorControl(); void StopTorControl(); |