From: svost <ya.nowa@yandex.ru>
Date: Fri, 1 Apr 2016 20:54:15 +0000 (+0300)
Subject: Remove BOOST_FOREACH macro
X-Git-Tag: nvc-v0.5.8~7^2~1
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=6bd80c2d737da9422283de5dd3033e318dcb96b7

Remove BOOST_FOREACH macro
---

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index c6fb487..a9728ff 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -213,8 +213,8 @@ namespace Checkpoints
             // relay the checkpoint
             if (!checkpointMessage.IsNull())
             {
-                BOOST_FOREACH(CNode* pnode, vNodes)
-                    checkpointMessage.RelayTo(pnode);
+                for (std::vector<CNode*>::iterator it = vNodes.begin(); it != vNodes.end(); ++it)
+                    checkpointMessage.RelayTo(*it);
             }
             return true;
         }
@@ -370,8 +370,8 @@ namespace Checkpoints
         // Relay checkpoint
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodes)
-                checkpoint.RelayTo(pnode);
+            for (std::vector<CNode*>::iterator it = vNodes.begin(); it != vNodes.end(); ++it)
+                checkpoint.RelayTo(*it);
         }
         return true;
     }
diff --git a/src/main.cpp b/src/main.cpp
index f62b1e9..0d19e8b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1970,10 +1970,10 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew)
         }
 
         // Connect further blocks
-        BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vpindexSecondary)
+        for (std::vector<CBlockIndex*>::reverse_iterator rit = vpindexSecondary.rbegin(); rit != vpindexSecondary.rend(); ++rit)
         {
             CBlock block;
-            if (!block.ReadFromDisk(pindex))
+            if (!block.ReadFromDisk(*rit))
             {
                 printf("SetBestChain() : ReadFromDisk failed\n");
                 break;
@@ -1983,7 +1983,7 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew)
                 break;
             }
             // errors now are not fatal, we still did a reorganisation to a new chain in a valid way
-            if (!block.SetBestChainInner(txdb, pindex))
+            if (!block.SetBestChainInner(txdb, *rit))
                 break;
         }
     }