diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-08 11:25:46 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-08 11:25:51 +0200 |
commit | 2f174498d616b8aae585b7bb04adb2351ce40ca7 (patch) | |
tree | 23bc6a827161f07cafae2bad6fefcacb1ada1cb7 /src/util | |
parent | df50fd194fb804edba8a513b1eb699de38ca3963 (diff) | |
parent | 0d86f4d3dacab38f3cd5371d0c920585c178302c (diff) |
Merge #17073: move-only: PASTE macros to util/macros.h
0d86f4d3dacab38f3cd5371d0c920585c178302c refactor: consolidate PASTE macros (James O'Beirne)
Pull request description:
Really dumb move-only stolen from #16805. Some of my pull requests also depend on this, so I split it up to not depend on #16805.
ACKs for top commit:
practicalswift:
ACK 0d86f4d3dacab38f3cd5371d0c920585c178302c -- diff looks correct
hebasto:
ACK 0d86f4d3dacab38f3cd5371d0c920585c178302c, I have reviewed the code and it looks OK, I agree it can be merged.
promag:
ACK 0d86f4d3dacab38f3cd5371d0c920585c178302c.
Tree-SHA512: 19208a8cbf83034b1ef25138d8f08d8f32ace7775f654b1597fc4599dd576f0758145f592f161cfdcaaa29d4907ac9aa5553f6f524e2b960205c760605a05901
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/macros.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/util/macros.h b/src/util/macros.h new file mode 100644 index 0000000000..36ea87c0fe --- /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 |