highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent -Wshadow warnings with gcc versions 4.8.5, 5.3.1 and 6.2.1.

Browse Source
This commit is contained in:
Pavel Janík
2017-03-03 16:20:33 +01:00
parent 3d857f307b
commit bb2aaeeeea
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/torcontrol.cpp
View File

@@ -662,26 +662,26 @@ void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg)
}
/****** Thread ********/
struct event_base *base;
struct event_base *gBase;
boost::thread torControlThread;
static void TorControlThread()
{
TorController ctrl(base, GetArg("-torcontrol", DEFAULT_TOR_CONTROL));
TorController ctrl(gBase, GetArg("-torcontrol", DEFAULT_TOR_CONTROL));
event_base_dispatch(base);
event_base_dispatch(gBase);
}
void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler)
{
assert(!base);
assert(!gBase);
#ifdef WIN32
evthread_use_windows_threads();
#else
evthread_use_pthreads();
#endif
base = event_base_new();
if (!base) {
gBase = event_base_new();
if (!gBase) {
LogPrintf("tor: Unable to create event_base\n");
return;
}
@@ -691,18 +691,18 @@ void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler)
void InterruptTorControl()
{
if (base) {
if (gBase) {
LogPrintf("tor: Thread interrupt\n");
event_base_loopbreak(base);
event_base_loopbreak(gBase);
}
}
void StopTorControl()
{
if (base) {
if (gBase) {
torControlThread.join();
event_base_free(base);
base = 0;
event_base_free(gBase);
gBase = 0;
}
}