From 49a8ed6d3634f1b0f8f58af5bcac76534a9b7fbb Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 14 Mar 2016 18:38:07 +0100
Subject: [PATCH] Merge #7683: Fix torcontrol.cpp unused private field warning

3d7e973 Fix torcontrol.cpp unused private field warning (Jonas Schnelli)
---
 src/torcontrol.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index ec0e257ea..43b9612c6 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -394,8 +394,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)
 {