diff options
| author | James O'Beirne <[email protected]> | 2019-09-25 10:55:52 -0400 |
|---|---|---|
| committer | James O'Beirne <[email protected]> | 2019-09-25 10:56:00 -0400 |
| commit | 0d86f4d3dacab38f3cd5371d0c920585c178302c (patch) | |
| tree | e0adcd40ed647c8d803e51642760be4537af865b /src | |
| parent | Merge #16745: wallet: Translate all initErrors in CreateWalletFromFile (diff) | |
| download | discoin-0d86f4d3dacab38f3cd5371d0c920585c178302c.tar.xz discoin-0d86f4d3dacab38f3cd5371d0c920585c178302c.zip | |
refactor: consolidate PASTE macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/sync.h | 4 | ||||
| -rw-r--r-- | src/util/macros.h | 11 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8fc7f61d4..7af04148c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -209,6 +209,7 @@ BITCOIN_CORE_H = \ util/error.h \ util/fees.h \ util/system.h \ + util/macros.h \ util/memory.h \ util/moneystr.h \ util/rbf.h \ diff --git a/src/sync.h b/src/sync.h index bdbdde1a2..8ff617314 100644 --- a/src/sync.h +++ b/src/sync.h @@ -7,6 +7,7 @@ #define BITCOIN_SYNC_H #include <threadsafety.h> +#include <util/macros.h> #include <condition_variable> #include <thread> @@ -176,9 +177,6 @@ public: template<typename MutexArg> using DebugLock = UniqueLock<typename std::remove_reference<typename std::remove_pointer<MutexArg>::type>::type>; -#define PASTE(x, y) x ## y -#define PASTE2(x, y) PASTE(x, y) - #define LOCK(cs) DebugLock<decltype(cs)> PASTE2(criticalblock, __COUNTER__)(cs, #cs, __FILE__, __LINE__) #define LOCK2(cs1, cs2) \ DebugLock<decltype(cs1)> criticalblock1(cs1, #cs1, __FILE__, __LINE__); \ diff --git a/src/util/macros.h b/src/util/macros.h new file mode 100644 index 000000000..36ea87c0f --- /dev/null +++ b/src/util/macros.h @@ -0,0 +1,11 @@ +// Copyright (c) 2019 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_UTIL_MACROS_H +#define BITCOIN_UTIL_MACROS_H + +#define PASTE(x, y) x ## y +#define PASTE2(x, y) PASTE(x, y) + +#endif // BITCOIN_UTIL_MACROS_H |