Auto merge of #4777 - daira:fix-bind-warning, r=str4d

Fix a new warning about use of boost::bind placeholders after updating Boost

closes #4774

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Homu 2020-10-12 01:04:01 +00:00
commit 3c8ce84d24
3 changed files with 7 additions and 3 deletions

View File

@ -56,7 +56,7 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
#include <boost/thread.hpp>
@ -67,6 +67,7 @@
#include "librustzcash.h"
using namespace std;
using namespace boost::placeholders;
extern void ThreadSendAlert();

View File

@ -18,7 +18,7 @@
#include <univalue.h>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
#include <boost/iostreams/concepts.hpp>
@ -32,6 +32,7 @@
using namespace RPCServer;
using namespace std;
using namespace boost::placeholders;
static bool fRPCRunning = false;
static bool fRPCInWarmup = true;

View File

@ -14,7 +14,7 @@
#include <set>
#include <stdlib.h>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/signals2/signal.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/predicate.hpp>
@ -28,6 +28,8 @@
#include <event2/event.h>
#include <event2/thread.h>
using namespace boost::placeholders;
/** Default control port */
const std::string DEFAULT_TOR_CONTROL = "127.0.0.1:9051";
/** Tor cookie size (from control-spec.txt) */