zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent a92aded70e 7d4dda7630
commit 5795aaca26
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/init.cpp
View File

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

1
src/init.h
View File

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