Merge #9132: Make strWalletFile const

f734505 Make strWalletFile const (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan committed 2016-11-15 10:06:01 +01:00
commit f54e4605fc
1 file changed
+2 -4
+2 -4
View File
@@ -600,7 +600,7 @@ public:
*/ */
mutable CCriticalSection cs_wallet; mutable CCriticalSection cs_wallet;
std::string strWalletFile; const std::string strWalletFile;
void LoadKeyPool(int nIndex, const CKeyPool &keypool) void LoadKeyPool(int nIndex, const CKeyPool &keypool)
{ {
@@ -625,11 +625,9 @@ public:
SetNull(); SetNull();
} }
CWallet(const std::string& strWalletFileIn) CWallet(const std::string& strWalletFileIn) : strWalletFile(strWalletFileIn)
{ {
SetNull(); SetNull();
strWalletFile = strWalletFileIn;
fFileBacked = true; fFileBacked = true;
} }