aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-09-02 16:47:58 -0700
committerGavin Andresen <gavinandresen@gmail.com>2012-09-02 16:47:58 -0700
commiteaf00a3a5d80fb50d761c14b7c295df6ae2f0e44 (patch)
tree92c402e1cf3352c8079af84cc60f5129ffeb1d6f /src/wallet.h
parent4d0c2b6cf4e0d3ece4e785af442e8d5538770048 (diff)
parentddb709e9de1490afcfa1af045517d2228d5b864c (diff)
downloadbitcoin-eaf00a3a5d80fb50d761c14b7c295df6ae2f0e44.tar.xz
Merge pull request #1774 from luke-jr/refactor_times
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
Diffstat (limited to 'src/wallet.h')
-rw-r--r--src/wallet.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h
index 44f8a17d37..7fd33629fe 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -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);