Merge branch 'master' into continuousClose

This commit is contained in:
JoelKatz
2012-06-30 16:32:38 -07:00
12 changed files with 182 additions and 86 deletions

View File

@@ -66,6 +66,8 @@ protected:
boost::unordered_set<InfoSub*> mSubTransaction; // all transactions
// subInfoMapType mSubTransactionAccounts;
Json::Value transJson(const SerializedTransaction& stTxn, TransactionEngineResult terResult, const std::string& strStatus, int iSeq, const std::string& strType);
public:
NetworkOPs(boost::asio::io_service& io_service, LedgerMaster* pLedgerMaster);