use auto for the iterators

Paul · Paul · commit cb16cf0760bf · 2018-07-01T21:50:35.000-05:00
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
@@ -23,7 +23,7 @@ CZMQNotificationInterface::~CZMQNotificationInterface()
 {
     Shutdown();
 
-    for (std::list<CZMQAbstractNotifier*>::iterator it=notifiers.begin(); it!=notifiers.end(); ++it)
+    for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)
     {
         delete *it;
     }
@@ -87,7 +87,7 @@ bool CZMQNotificationInterface::Initialize()
         return false;
     }
 
-    std::list<CZMQAbstractNotifier*>::iterator it=notifiers.begin();
+    auto it=notifiers.begin();
     for (; it!=notifiers.end(); ++it)
     {
         if (it->Initialize(pcontext))
@@ -115,7 +115,7 @@ void CZMQNotificationInterface::Shutdown()
     LogPrint("zmq", "zmq: Shutdown notification interface\n");
     if (pcontext)
     {
-        for (std::list<CZMQAbstractNotifier*>::iterator it=notifiers.begin(); it!=notifiers.end(); ++it)
+        for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)
         {
             LogPrint("zmq", "   Shutdown notifier %s at %s\n", it->GetType(), it->GetAddress());
             it->Shutdown();
@@ -131,7 +131,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co
     if (fInitialDownload || pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones
         return;
 
-    for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it!=notifiers.end(); )
+    for (auto it = notifiers.begin(); it!=notifiers.end(); )
     {
         if (it->NotifyBlock(pindexNew))
         {
@@ -147,7 +147,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co
 
 void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int posInBlock)
 {
-    for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it!=notifiers.end(); )
+    for (auto it = notifiers.begin(); it!=notifiers.end(); )
     {
         if (it->NotifyTransaction(tx))
         {
@@ -163,7 +163,7 @@ void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CB
 
 void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)
 {
-    for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it!=notifiers.end(); )
+    for (auto it = notifiers.begin(); it!=notifiers.end(); )
     {
         if (it->NotifyTransactionLock(tx))
         {
@@ -179,7 +179,7 @@ void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)
 
 void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote)
 {
-    for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it != notifiers.end(); )
+    for (auto it = notifiers.begin(); it != notifiers.end(); )
     {
         if (it->NotifyGovernanceVote(vote))
         {
@@ -195,7 +195,7 @@ void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote
 
 void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &object)
 {
-    for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it != notifiers.end(); )
+    for (auto it = notifiers.begin(); it != notifiers.end(); )
     {
         if (it->NotifyGovernanceObject(object))
         {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ CZMQNotificationInterface::~CZMQNotificationInterface()`
`23`	`23`	`{`
`24`	`24`	`Shutdown();`
`25`	`25`
`26`		`- for (std::list<CZMQAbstractNotifier*>::iterator it=notifiers.begin(); it!=notifiers.end(); ++it)`
	`26`	`+ for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)`
`27`	`27`	`{`
`28`	`28`	`delete *it;`
`29`	`29`	`}`
`@@ -87,7 +87,7 @@ bool CZMQNotificationInterface::Initialize()`
`87`	`87`	`return false;`
`88`	`88`	`}`
`89`	`89`
`90`		`- std::list<CZMQAbstractNotifier*>::iterator it=notifiers.begin();`
	`90`	`+ auto it=notifiers.begin();`
`91`	`91`	`for (; it!=notifiers.end(); ++it)`
`92`	`92`	`{`
`93`	`93`	`if (it->Initialize(pcontext))`
`@@ -115,7 +115,7 @@ void CZMQNotificationInterface::Shutdown()`
`115`	`115`	`LogPrint("zmq", "zmq: Shutdown notification interface\n");`
`116`	`116`	`if (pcontext)`
`117`	`117`	`{`
`118`		`- for (std::list<CZMQAbstractNotifier*>::iterator it=notifiers.begin(); it!=notifiers.end(); ++it)`
	`118`	`+ for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)`
`119`	`119`	`{`
`120`	`120`	`LogPrint("zmq", " Shutdown notifier %s at %s\n", it->GetType(), it->GetAddress());`
`121`	`121`	`it->Shutdown();`
`@@ -131,7 +131,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co`
`131`	`131`	`if (fInitialDownload \|\| pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones`
`132`	`132`	`return;`
`133`	`133`
`134`		`- for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it!=notifiers.end(); )`
	`134`	`+ for (auto it = notifiers.begin(); it!=notifiers.end(); )`
`135`	`135`	`{`
`136`	`136`	`if (it->NotifyBlock(pindexNew))`
`137`	`137`	`{`
`@@ -147,7 +147,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co`
`147`	`147`
`148`	`148`	`void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int posInBlock)`
`149`	`149`	`{`
`150`		`- for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it!=notifiers.end(); )`
	`150`	`+ for (auto it = notifiers.begin(); it!=notifiers.end(); )`
`151`	`151`	`{`
`152`	`152`	`if (it->NotifyTransaction(tx))`
`153`	`153`	`{`
`@@ -163,7 +163,7 @@ void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CB`
`163`	`163`
`164`	`164`	`void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)`
`165`	`165`	`{`
`166`		`- for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it!=notifiers.end(); )`
	`166`	`+ for (auto it = notifiers.begin(); it!=notifiers.end(); )`
`167`	`167`	`{`
`168`	`168`	`if (it->NotifyTransactionLock(tx))`
`169`	`169`	`{`
`@@ -179,7 +179,7 @@ void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)`
`179`	`179`
`180`	`180`	`void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote)`
`181`	`181`	`{`
`182`		`- for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it != notifiers.end(); )`
	`182`	`+ for (auto it = notifiers.begin(); it != notifiers.end(); )`
`183`	`183`	`{`
`184`	`184`	`if (it->NotifyGovernanceVote(vote))`
`185`	`185`	`{`
`@@ -195,7 +195,7 @@ void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote`
`195`	`195`
`196`	`196`	`void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &object)`
`197`	`197`	`{`
`198`		`- for (std::list<CZMQAbstractNotifier*>::iterator it = notifiers.begin(); it != notifiers.end(); )`
	`198`	`+ for (auto it = notifiers.begin(); it != notifiers.end(); )`
`199`	`199`	`{`
`200`	`200`	`if (it->NotifyGovernanceObject(object))`
`201`	`201`	`{`