DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

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

Browse Source 
Zcash: partial (ignoring src/test/script_tests.cpp due to merge conflicts)
This commit is contained in:
Pavel Janík
2017-03-03 16:20:33 +01:00
committed by Jack Grigg
parent 9e5c9d0a04
commit f0e9019223
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/streams.h
View File

@@ -295,8 +295,8 @@ public:
return (*this); return (*this);
} }
void GetAndClear(CSerializeData &data) { void GetAndClear(CSerializeData &d) {
data.insert(data.end(), begin(), end()); d.insert(d.end(), begin(), end());
clear(); clear();
} }
}; };

22
src/torcontrol.cpp
View File

@@ -657,26 +657,26 @@ void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg)
} }
/****** Thread ********/ /****** Thread ********/
struct event_base *base; struct event_base *gBase;
boost::thread torControlThread; boost::thread torControlThread;
static void 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) void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler)
{ {
assert(!base); assert(!gBase);
#ifdef WIN32 #ifdef WIN32
evthread_use_windows_threads(); evthread_use_windows_threads();
#else #else
evthread_use_pthreads(); evthread_use_pthreads();
#endif #endif
base = event_base_new(); gBase = event_base_new();
if (!base) { if (!gBase) {
LogPrintf("tor: Unable to create event_base\n"); LogPrintf("tor: Unable to create event_base\n");
return; return;
} }
@@ -686,18 +686,18 @@ void StartTorControl(boost::thread_group& threadGroup, CScheduler& scheduler)
void InterruptTorControl() void InterruptTorControl()
{ {
if (base) { if (gBase) {
LogPrintf("tor: Thread interrupt\n"); LogPrintf("tor: Thread interrupt\n");
event_base_loopbreak(base); event_base_loopbreak(gBase);
} }
} }
void StopTorControl() void StopTorControl()
{ {
if (base) { if (gBase) {
torControlThread.join(); torControlThread.join();
event_base_free(base); event_base_free(gBase);
base = 0; gBase = 0;
} }
} }