Merge #7683: Fix torcontrol.cpp unused private field warning

3d7e973 Fix torcontrol.cpp unused private field warning (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2016-03-14 18:38:07 +01:00 committed by Alexander Block
parent abbbe61d0f
commit 49a8ed6d36

View File

@ -394,8 +394,8 @@ private:
static void reconnect_cb(evutil_socket_t fd, short what, void *arg); static void reconnect_cb(evutil_socket_t fd, short what, void *arg);
}; };
TorController::TorController(struct event_base* base, const std::string& target): TorController::TorController(struct event_base* baseIn, const std::string& target):
base(base), base(baseIn),
target(target), conn(base), reconnect(true), reconnect_ev(0), target(target), conn(base), reconnect(true), reconnect_ev(0),
reconnect_timeout(RECONNECT_TIMEOUT_START) reconnect_timeout(RECONNECT_TIMEOUT_START)
{ {