diff options
| author | merge-script <fanquake@gmail.com> | 2024-06-21 11:20:46 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-06-21 11:20:46 +0100 |
| commit | a19563ac86de04f3da18fd50bfb8b69ab4dc1e61 (patch) | |
| tree | 1f5ebfd42ae9a41548615412c470f4329b2be4ed /src/validation.cpp | |
| parent | a961ad1bebc54912b88d072abf22ab7d3cf46bf1 (diff) | |
| parent | 5729dbbb7424d02c5e5bc4f2eb340fdc1c0100b4 (diff) | |
Merge bitcoin/bitcoin#30316: refactor: remove extraneous lock annotations from function definitions
5729dbbb7424d02c5e5bc4f2eb340fdc1c0100b4 refactor: remove extraneous lock annotations from function definitions (Cory Fields)
Pull request description:
These annotations belong in the declarations rather than the definitions. While harmless now, future versions of clang may warn about these.
Discovered these using the upstream WIP: https://github.com/llvm/llvm-project/pull/67520
ACKs for top commit:
instagibbs:
ACK 5729dbbb7424d02c5e5bc4f2eb340fdc1c0100b4
maflcko:
ACK 5729dbbb7424d02c5e5bc4f2eb340fdc1c0100b4 🦋
Tree-SHA512: c82c6b269dd353b140cbb36b5519ab2637e54034f159d6ad3eb78c6f4019aa053a5973c626395f0ed3366b9f4117ecc4fe7926b83e9714b1e21c97d5e4bed8d7
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index c34d60f137..3e9ba08bb1 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1849,7 +1849,6 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptPackage(const Package& package, MempoolAcceptResult AcceptToMemoryPool(Chainstate& active_chainstate, const CTransactionRef& tx, int64_t accept_time, bool bypass_limits, bool test_accept) - EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { AssertLockHeld(::cs_main); const CChainParams& chainparams{active_chainstate.m_chainman.GetParams()}; |