aboutsummaryrefslogtreecommitdiff
path: root/src/bench
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-05-17 17:17:51 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2017-05-17 17:22:43 -0700
commitc33652576ce21694b33a94832378f737dd6959fb (patch)
tree5122905e6d0ea4d35a4b2eaa799a8d31dd3b48be /src/bench
parente317c0d19201ff75fa7afedf93a9d1cd2c560af2 (diff)
parent1b936f59264a4f4a867baece1e0ee4ec02f73cee (diff)
downloadbitcoin-c33652576ce21694b33a94832378f737dd6959fb.tar.xz
Merge #10395: Replace boost::function with std::function (C++11)
1b936f5 Replace boost::function with std::function (C++11) (practicalswift) Tree-SHA512: c4faec8cf3f801842010976115681f68ffa08fbc97ba50b22e95c936840f47e1b3bd8d7fd2f5b4e094b5a46bf3d29fc90b69d975a99e77322c0d19f8a00d53d3
Diffstat (limited to 'src/bench')
-rw-r--r--src/bench/bench.cpp1
-rw-r--r--src/bench/bench.h5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index b0df3d2b04..33631d2d15 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -5,6 +5,7 @@
#include "bench.h"
#include "perf.h"
+#include <assert.h>
#include <iostream>
#include <iomanip>
#include <sys/time.h>
diff --git a/src/bench/bench.h b/src/bench/bench.h
index f12a41126c..1f36f2a4bc 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -5,10 +5,11 @@
#ifndef BITCOIN_BENCH_BENCH_H
#define BITCOIN_BENCH_BENCH_H
+#include <functional>
+#include <limits>
#include <map>
#include <string>
-#include <boost/function.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/stringize.hpp>
@@ -59,7 +60,7 @@ namespace benchmark {
bool KeepRunning();
};
- typedef boost::function<void(State&)> BenchFunction;
+ typedef std::function<void(State&)> BenchFunction;
class BenchRunner
{