Merge branch 'develop' of github.com:ripple/rippled into develop

This commit is contained in:
JoelKatz
2013-07-11 09:39:51 -07:00

View File

@@ -920,7 +920,7 @@ int NetworkOPs::beginConsensus (uint256 const& networkClosed, Ledger::pointer cl
bool NetworkOPs::haveConsensusObject ()
{
if (mConsensus)
if (mConsensus != nullptr)
return true;
if ((mMode == omFULL) || (mMode == omTRACKING))
@@ -941,7 +941,7 @@ bool NetworkOPs::haveConsensusObject ()
}
}
return mConsensus;
return mConsensus != nullptr;
}
uint256 NetworkOPs::getConsensusLCL ()