Merge pull request #5983

Jeff Garzik · Jeff Garzik · commit c2fa08461118 · 2015-04-12T11:48:12.000-04:00
diff --git a/src/wallet/db.h b/src/wallet/db.h
@@ -25,9 +25,6 @@ class COutPoint;
 
 extern unsigned int nWalletDBUpdated;
 
-void ThreadFlushWalletDB(const std::string& strWalletFile);
-
-
 class CDBEnv
 {
 private:
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -138,5 +138,6 @@ class CWalletDB : public CDB
 };
 
 bool BackupWallet(const CWallet& wallet, const std::string& strDest);
+void ThreadFlushWalletDB(const std::string& strFile);
 
 #endif // BITCOIN_WALLETDB_H

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ class COutPoint;`
`25`	`25`
`26`	`26`	`extern unsigned int nWalletDBUpdated;`
`27`	`27`
`28`		`-void ThreadFlushWalletDB(const std::string& strWalletFile);`
`29`		`-`
`30`		`-`
`31`	`28`	`class CDBEnv`
`32`	`29`	`{`
`33`	`30`	`private:`