sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#21059: Drop boost/preprocessor dependencies

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-02-01 22:19:59 +02:00 committed by PastaPastaPasta
parent 0761496ce4
commit 1cf996ac8c
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bench/bench.h
View File

@ -5,6 +5,8 @@
#ifndef BITCOIN_BENCH_BENCH_H #ifndef BITCOIN_BENCH_BENCH_H
#define BITCOIN_BENCH_BENCH_H #define BITCOIN_BENCH_BENCH_H
#include <util/macros.h>
#include <chrono> #include <chrono>
#include <functional> #include <functional>
#include <map> #include <map>
@ -12,8 +14,6 @@
#include <vector> #include <vector>
#include <bench/nanobench.h> #include <bench/nanobench.h>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/stringize.hpp>
/* /*
* Usage: * Usage:
@ -56,8 +56,8 @@ public:
static void RunAll(const Args& args); static void RunAll(const Args& args);
}; };
} }
// BENCHMARK(foo) expands to: benchmark::BenchRunner bench_11foo("foo"); // BENCHMARK(foo) expands to: benchmark::BenchRunner bench_11foo("foo", foo);
#define BENCHMARK(n) \ #define BENCHMARK(n) \
benchmark::BenchRunner BOOST_PP_CAT(bench_, BOOST_PP_CAT(__LINE__, n))(BOOST_PP_STRINGIZE(n), n); benchmark::BenchRunner PASTE2(bench_, PASTE2(__LINE__, n))(STRINGIZE(n), n);
#endif // BITCOIN_BENCH_BENCH_H #endif // BITCOIN_BENCH_BENCH_H

9
src/clientversion.h
View File

@ -5,6 +5,8 @@
#ifndef BITCOIN_CLIENTVERSION_H #ifndef BITCOIN_CLIENTVERSION_H
#define BITCOIN_CLIENTVERSION_H #define BITCOIN_CLIENTVERSION_H
#include <util/macros.h>
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h> #include <config/bitcoin-config.h>
#endif //HAVE_CONFIG_H #endif //HAVE_CONFIG_H
@ -14,13 +16,6 @@
#error Client version information missing: version is not defined by bitcoin-config.h or in any other way #error Client version information missing: version is not defined by bitcoin-config.h or in any other way
#endif #endif
/**
* Converts the parameter X to a string after macro replacement on X has been performed.
* Don't merge these into one macro!
*/
#define STRINGIZE(X) DO_STRINGIZE(X)
#define DO_STRINGIZE(X) #X
//! Copyright string used in Windows .rc files //! Copyright string used in Windows .rc files
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " " COPYRIGHT_HOLDERS_FINAL #define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " " COPYRIGHT_HOLDERS_FINAL

7
src/util/macros.h
View File

@ -8,4 +8,11 @@
#define PASTE(x, y) x ## y #define PASTE(x, y) x ## y
#define PASTE2(x, y) PASTE(x, y) #define PASTE2(x, y) PASTE(x, y)
/**
* Converts the parameter X to a string after macro replacement on X has been performed.
* Don't merge these into one macro!
*/
#define STRINGIZE(X) DO_STRINGIZE(X)
#define DO_STRINGIZE(X) #X
#endif // BITCOIN_UTIL_MACROS_H #endif // BITCOIN_UTIL_MACROS_H

2
test/lint/lint-includes.sh
View File

@ -61,8 +61,6 @@ EXPECTED_BOOST_INCLUDES=(
boost/multi_index_container.hpp boost/multi_index_container.hpp
boost/optional.hpp boost/optional.hpp
boost/pool/pool_alloc.hpp boost/pool/pool_alloc.hpp
boost/preprocessor/cat.hpp
boost/preprocessor/stringize.hpp
boost/signals2/connection.hpp boost/signals2/connection.hpp
boost/signals2/optional_last_value.hpp boost/signals2/optional_last_value.hpp
boost/signals2/signal.hpp boost/signals2/signal.hpp