mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge #10193: scripted-diff: Remove #include <boost/foreach.hpp>
b1268a1clang-format: Delete ForEachMacros (Jorge Timón)5995735scripted-diff: Remove #include <boost/foreach.hpp> (Jorge Timón)3eff827scripted-diff: Remove BOOST_REVERSE_FOREACH (Jorge Timón)33aed5bFix const_reverse_iterator constructor (pass const ptr) (Jorge Timón)300851eIntroduce src/reverse_iterator.hpp and include it... (Jorge Timón) Tree-SHA512: df3405328e9602d0a433ac134ba59a5c9a6202ef64188df2f94a59b2ce58dec7c988b25d0671c7937de516a96b2e6daeb9d04c82fa363b616ee4cf6e9cb0fac6
This commit is contained in:
commit
6dbcc74a0e
38 changed files with 53 additions and 39 deletions
|
|
@ -24,6 +24,7 @@
|
|||
#include "primitives/block.h"
|
||||
#include "primitives/transaction.h"
|
||||
#include "random.h"
|
||||
#include "reverse_iterator.h"
|
||||
#include "script/script.h"
|
||||
#include "script/sigcache.h"
|
||||
#include "script/standard.h"
|
||||
|
|
@ -2340,7 +2341,7 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
|
|||
nHeight = nTargetHeight;
|
||||
|
||||
// Connect new blocks.
|
||||
BOOST_REVERSE_FOREACH(CBlockIndex *pindexConnect, vpindexToConnect) {
|
||||
for (CBlockIndex *pindexConnect : reverse_iterate(vpindexToConnect)) {
|
||||
if (!ConnectTip(state, chainparams, pindexConnect, pindexConnect == pindexMostWork ? pblock : std::shared_ptr<const CBlock>(), connectTrace, disconnectpool)) {
|
||||
if (state.IsInvalid()) {
|
||||
// The block violates a consensus rule.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue