Merge pull request #1774 from luke-jr/refactor_times

Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
This commit is contained in:
Gavin Andresen
2012-09-02 16:47:58 -07:00
3 changed files with 12 additions and 6 deletions

View File

@@ -146,7 +146,12 @@ public:
typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair;
typedef std::multimap<int64, TxPair > TxItems;
TxItems OrderedTxItems(std::string strAccount = "");
/** Get the wallet's activity log
@return multimap of ordered transactions and accounting entries
@warning Returned pointers are *only* valid within the scope of passed acentries
*/
TxItems OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount = "");
void MarkDirty();
bool AddToWallet(const CWalletTx& wtxIn);