diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp index 1876b5872b..89ab4ca3dd 100644 --- a/src/LedgerAcquire.cpp +++ b/src/LedgerAcquire.cpp @@ -220,7 +220,7 @@ void LedgerAcquire::trigger(Peer::pointer peer) tmGL->set_ledgerhash(mHash.begin(), mHash.size()); tmGL->set_ledgerseq(mLedger->getLedgerSeq()); tmGL->set_itype(newcoin::liAS_NODE); - for (std::vector::iterator it =nodeIDs.begin(); it != nodeIDs.end(); ++it) + for (std::vector::iterator it = nodeIDs.begin(); it != nodeIDs.end(); ++it) *(tmGL->add_nodeids()) = it->getRawString(); if (peer) { @@ -325,7 +325,7 @@ bool LedgerAcquire::takeAsNode(const std::list& nodeIDs, #endif if (!mHaveBase) return false; std::list::const_iterator nodeIDit = nodeIDs.begin(); - std::list >::const_iterator nodeDatait = data.begin(); + std::list< std::vector >::const_iterator nodeDatait = data.begin(); while (nodeIDit != nodeIDs.end()) { if (nodeIDit->isRoot()) @@ -411,10 +411,10 @@ bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet, Peer::poi std::list nodeIDs; std::list > nodeData; - if (packet.nodes().size()<=0) return false; + if (packet.nodes().size() <= 0) return false; for (int i = 0; i::iterator nodeIDIterator; std::list >::iterator rawNodeIterator; - for(nodeIDIterator=nodeIDs.begin(), rawNodeIterator=rawNodes.begin(); - nodeIDIterator!=nodeIDs.end(); ++nodeIDIterator, ++rawNodeIterator) + for(nodeIDIterator = nodeIDs.begin(), rawNodeIterator = rawNodes.begin(); + nodeIDIterator != nodeIDs.end(); ++nodeIDIterator, ++rawNodeIterator) { Serializer nID(33); nodeIDIterator->addIDRaw(nID); - newcoin::TMLedgerNode* node=data->add_nodes(); + newcoin::TMLedgerNode* node = data->add_nodes(); node->set_nodeid(nID.getDataPtr(), nID.getLength()); node->set_nodedata(&rawNodeIterator->front(), rawNodeIterator->size()); } @@ -766,14 +766,14 @@ void Peer::recvGetLedger(newcoin::TMGetLedger& packet) punishPeer(PP_INVALID_REQUEST); return; } - PackedMessage::pointer oPacket=boost::make_shared + PackedMessage::pointer oPacket = boost::make_shared (PackedMessage::MessagePointer(data), newcoin::mtLEDGER); sendPacket(oPacket); } void Peer::recvLedger(newcoin::TMLedgerData& packet) { - if(!theApp->getMasterLedgerAcquire().gotLedgerData(packet, shared_from_this())) + if (!theApp->getMasterLedgerAcquire().gotLedgerData(packet, shared_from_this())) punishPeer(PP_UNWANTED_DATA); }