highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2009 from sipa/fixmove

Browse Source 
Prevent RPC 'move' from deadlocking
This commit is contained in:
Gavin Andresen
2012-11-16 08:09:41 -08:00
parent 1fefd2a5bc 4291e8feab
commit e45d39f9ee
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet.h
View File

@@ -149,7 +149,7 @@ public:
/** Increment the next transaction order id
@return next transaction order id
*/
int64 IncOrderPosNext();
int64 IncOrderPosNext(CWalletDB *pwalletdb = NULL);
typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair;
typedef std::multimap<int64, TxPair > TxItems;