diff options
| author | Jeff Garzik <[email protected]> | 2014-06-05 09:09:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2014-06-05 09:09:50 -0400 |
| commit | 5795aaca26d23d315f80ee0b45f1e1fa939e5cfd (patch) | |
| tree | 79d777a0a2610653330635423e46922c95a81201 | |
| parent | Fix GUI build with `--disable-wallet` (diff) | |
| parent | Remove global strWalletFile (diff) | |
| download | discoin-5795aaca26d23d315f80ee0b45f1e1fa939e5cfd.tar.xz discoin-5795aaca26d23d315f80ee0b45f1e1fa939e5cfd.zip | |
Merge pull request #4294 from laanwj/2014_06_no_global_strwallet
Remove global strWalletFile
| -rw-r--r-- | src/init.cpp | 3 | ||||
| -rw-r--r-- | src/init.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 96f7f7b3c..d924bd293 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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 diff --git a/src/init.h b/src/init.h index 2f5692305..4a967bea3 100644 --- a/src/init.h +++ b/src/init.h @@ -14,7 +14,6 @@ namespace boost { class thread_group; }; -extern std::string strWalletFile; extern CWallet* pwalletMain; void StartShutdown(); |