continued e8a4c50

Paul · Paul · commit a78c8ad2c9bb · 2018-07-01T22:35:45.000-05:00
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
@@ -92,11 +92,11 @@ bool CZMQNotificationInterface::Initialize()
     {
         if ((*it)->Initialize(pcontext))
         {
-            LogPrint("zmq", "  Notifier %s ready (address = %s)\n", it->GetType(), it->GetAddress());
+            LogPrint("zmq", "  Notifier %s ready (address = %s)\n", (*it)->GetType(), (*it)->GetAddress());
         }
         else
         {
-            LogPrint("zmq", "  Notifier %s failed (address = %s)\n", it->GetType(), it->GetAddress());
+            LogPrint("zmq", "  Notifier %s failed (address = %s)\n", (*it)->GetType(), (*it)->GetAddress());
             break;
         }
     }
@@ -117,7 +117,7 @@ void CZMQNotificationInterface::Shutdown()
     {
         for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)
         {
-            LogPrint("zmq", "   Shutdown notifier %s at %s\n", it->GetType(), it->GetAddress());
+            LogPrint("zmq", "   Shutdown notifier %s at %s\n", (*it)->GetType(), (*it)->GetAddress());
             (*it)->Shutdown();
         }
         zmq_ctx_destroy(pcontext);
@@ -140,7 +140,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co
         else
         {
             (*it)->Shutdown();
-            it = notifiers.erase(i);
+            it = notifiers.erase(it);
         }
     }
 }
@@ -172,7 +172,7 @@ void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)
         else
         {
             (*it)->Shutdown();
-            it = notifiers.erase(i);
+            it = notifiers.erase(it);
         }
     }
 }
@@ -188,7 +188,7 @@ void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote
         else
         {
             (*it)->Shutdown();
-            it = notifiers.erase(i);
+            it = notifiers.erase(it);
         }
     }
 }
@@ -204,7 +204,7 @@ void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &
         else
         {
             (*it)->Shutdown();
-            it = notifiers.erase(i);
+            it = notifiers.erase(it);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,11 @@ bool CZMQNotificationInterface::Initialize()`
`92`	`92`	`{`
`93`	`93`	`if ((*it)->Initialize(pcontext))`
`94`	`94`	`{`
`95`		`- LogPrint("zmq", " Notifier %s ready (address = %s)\n", it->GetType(), it->GetAddress());`
	`95`	`+ LogPrint("zmq", " Notifier %s ready (address = %s)\n", (it)->GetType(), (it)->GetAddress());`
`96`	`96`	`}`
`97`	`97`	`else`
`98`	`98`	`{`
`99`		`- LogPrint("zmq", " Notifier %s failed (address = %s)\n", it->GetType(), it->GetAddress());`
	`99`	`+ LogPrint("zmq", " Notifier %s failed (address = %s)\n", (it)->GetType(), (it)->GetAddress());`
`100`	`100`	`break;`
`101`	`101`	`}`
`102`	`102`	`}`
`@@ -117,7 +117,7 @@ void CZMQNotificationInterface::Shutdown()`
`117`	`117`	`{`
`118`	`118`	`for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)`
`119`	`119`	`{`
`120`		`- LogPrint("zmq", " Shutdown notifier %s at %s\n", it->GetType(), it->GetAddress());`
	`120`	`+ LogPrint("zmq", " Shutdown notifier %s at %s\n", (it)->GetType(), (it)->GetAddress());`
`121`	`121`	`(*it)->Shutdown();`
`122`	`122`	`}`
`123`	`123`	`zmq_ctx_destroy(pcontext);`
`@@ -140,7 +140,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co`
`140`	`140`	`else`
`141`	`141`	`{`
`142`	`142`	`(*it)->Shutdown();`
`143`		`- it = notifiers.erase(i);`
	`143`	`+ it = notifiers.erase(it);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -172,7 +172,7 @@ void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)`
`172`	`172`	`else`
`173`	`173`	`{`
`174`	`174`	`(*it)->Shutdown();`
`175`		`- it = notifiers.erase(i);`
	`175`	`+ it = notifiers.erase(it);`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`}`
`@@ -188,7 +188,7 @@ void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote`
`188`	`188`	`else`
`189`	`189`	`{`
`190`	`190`	`(*it)->Shutdown();`
`191`		`- it = notifiers.erase(i);`
	`191`	`+ it = notifiers.erase(it);`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`	`}`
`@@ -204,7 +204,7 @@ void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &`
`204`	`204`	`else`
`205`	`205`	`{`
`206`	`206`	`(*it)->Shutdown();`
`207`		`- it = notifiers.erase(i);`
	`207`	`+ it = notifiers.erase(it);`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`}`