diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-14 18:38:07 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-14 18:38:09 +0100 |
| commit | 48f39058315c908c360acb596923cbc090119480 (patch) | |
| tree | 29550a1f3745e5d2f798049f480f8050f0e49e8a | |
| parent | 0735c0ca7c22ce6529643ff0063c4188a901d75f (diff) | |
| parent | 3d7e97376aad055de0af7dc09abf3ee80e734740 (diff) | |
Merge #7683: Fix torcontrol.cpp unused private field warning
3d7e973 Fix torcontrol.cpp unused private field warning (Jonas Schnelli)
| -rw-r--r-- | src/torcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index f755992a3e..1c7bc2dbee 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -393,8 +393,8 @@ private: static void reconnect_cb(evutil_socket_t fd, short what, void *arg); }; -TorController::TorController(struct event_base* base, const std::string& target): - base(base), +TorController::TorController(struct event_base* baseIn, const std::string& target): + base(baseIn), target(target), conn(base), reconnect(true), reconnect_ev(0), reconnect_timeout(RECONNECT_TIMEOUT_START) { |