diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-03-31 08:18:02 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-03-31 08:18:30 +0200 |
| commit | 87dc1dc55ffaffd782a16c7b50e188433912a617 (patch) | |
| tree | 132af052b0e40f0977c18a3284232b228c1edbfb /src/Makefile.am | |
| parent | 74b011bbfa3b607606cc7c0ce6e2d22cfd07605a (diff) | |
| parent | 2ef47ba6c57a12840499a13908ab61aefca6cb55 (diff) | |
Merge bitcoin/bitcoin#24714: util/check: Don't use a lambda for Assert/Assume
2ef47ba6c57a12840499a13908ab61aefca6cb55 util/check: stop using lambda for Assert/Assume (Anthony Towns)
7c9fe25c16d48b53a61fa2f6ff77eaf8820cb1f6 wallet: move Assert() check into constructor (Anthony Towns)
Pull request description:
Using a lambda creates a couple of odd namespacing issues, in particular making clang's thread safety analysis less helpful, and confusing gcc when calling member functions. Fix this by not using a lambda.
Fixes #21596
Fixes #24654
ACKs for top commit:
MarcoFalke:
ACK 2ef47ba6c57a12840499a13908ab61aefca6cb55 🚢
jonatack:
Tested re-ACK 2ef47ba6c57a12840499a13908ab61aefca6cb55
Tree-SHA512: 4bdbf3215f3d14472df0552362c5eebe8b7eea2d0928a8a41109edd4e0c5f95de6f8220eb2fee8506874e352c003907faf5ef344174795939306a618157b1bae
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d3ae9a8d8c..e14b5ec040 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -620,6 +620,7 @@ libbitcoin_util_a_SOURCES = \ util/asmap.cpp \ util/bip32.cpp \ util/bytevectorhash.cpp \ + util/check.cpp \ util/error.cpp \ util/fees.cpp \ util/getuniquepath.cpp \ @@ -838,6 +839,7 @@ bitcoin_chainstate_SOURCES = \ uint256.cpp \ util/asmap.cpp \ util/bytevectorhash.cpp \ + util/check.cpp \ util/getuniquepath.cpp \ util/hasher.cpp \ util/moneystr.cpp \ |