Merge pull request #4294 from laanwj/2014_06_no_global_strwallet

Remove global strWalletFile
This commit is contained in:
Jeff Garzik 2014-06-05 09:09:50 -04:00
commit 5795aaca26
2 changed files with 1 additions and 3 deletions

View File

@ -40,7 +40,6 @@ using namespace std;
using namespace boost;
#ifdef ENABLE_WALLET
std::string strWalletFile;
CWallet* pwalletMain;
#endif
@ -584,7 +583,7 @@ bool AppInit2(boost::thread_group& threadGroup)
}
bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);
strWalletFile = GetArg("-wallet", "wallet.dat");
std::string strWalletFile = GetArg("-wallet", "wallet.dat");
#endif
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log

View File

@ -14,7 +14,6 @@ namespace boost {
class thread_group;
};
extern std::string strWalletFile;
extern CWallet* pwalletMain;
void StartShutdown();