ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use abstract_clock

Browse Source
This commit is contained in:
Vinnie Falco
2014-01-16 09:01:33 -05:00
parent 68501763dd
commit fa10e90c9d
16 changed files with 109 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ripple_app/misc/NetworkOPs.cpp
View File

@@ -33,8 +33,10 @@ public:
public:
// VFALCO TODO Make LedgerMaster a SharedPtr or a reference.
//
NetworkOPsImp (LedgerMaster& ledgerMaster, Stoppable& parent, Journal journal)
NetworkOPsImp (clock_type& clock, LedgerMaster& ledgerMaster,
Stoppable& parent, Journal journal)
: NetworkOPs (parent)
, m_clock (clock)
, m_journal (journal)
, mLock (this, "NetOPs", __FILE__, __LINE__)
, mMode (omDISCONNECTED)
@@ -407,6 +409,8 @@ private:
void pubServer ();
private:
clock_type& m_clock;
typedef boost::unordered_map <uint160, SubMapType> SubInfoMapType;
typedef boost::unordered_map <uint160, SubMapType>::iterator SubInfoMapIterator;
@@ -1410,7 +1414,7 @@ int NetworkOPsImp::beginConsensus (uint256 const& networkClosed, Ledger::pointer
assert (!mConsensus);
prevLedger->setImmutable ();
mConsensus = LedgerConsensus::New(
mConsensus = LedgerConsensus::New (m_clock,
networkClosed, prevLedger,
m_ledgerMaster.getCurrentLedger ()->getCloseTimeNC ());
@@ -3104,10 +3108,14 @@ NetworkOPs::NetworkOPs (Stoppable& parent)
{
}
NetworkOPs::~NetworkOPs ()
{
}
//------------------------------------------------------------------------------
NetworkOPs* NetworkOPs::New (LedgerMaster& ledgerMaster,
NetworkOPs* NetworkOPs::New (clock_type& clock, LedgerMaster& ledgerMaster,
Stoppable& parent, Journal journal)
{
return new NetworkOPsImp (ledgerMaster, parent, journal);
return new NetworkOPsImp (clock, ledgerMaster, parent, journal);
}