aboutsummaryrefslogtreecommitdiff
path: root/src/torcontrol.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2016-03-14 18:38:07 +0100
committerWladimir J. van der Laan <[email protected]>2016-03-14 18:38:09 +0100
commit48f39058315c908c360acb596923cbc090119480 (patch)
tree29550a1f3745e5d2f798049f480f8050f0e49e8a /src/torcontrol.cpp
parentMerge #7608: [wallet] Move hardcoded file name out of log messages (diff)
parentFix torcontrol.cpp unused private field warning (diff)
downloaddiscoin-48f39058315c908c360acb596923cbc090119480.tar.xz
discoin-48f39058315c908c360acb596923cbc090119480.zip
Merge #7683: Fix torcontrol.cpp unused private field warning
3d7e973 Fix torcontrol.cpp unused private field warning (Jonas Schnelli)
Diffstat (limited to 'src/torcontrol.cpp')
-rw-r--r--src/torcontrol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index f755992a3..1c7bc2dbe 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)
{