Merge #8432: Make CWallet::fFileBacked private.
29c2d99 Make CWallet::fFileBacked private. (Patrick Strateman)
This commit is contained in:
parent
9589e24485
commit
e34e2bbcca
@ -651,6 +651,7 @@ private:
|
|||||||
/* HD derive new child key (on internal or external chain) */
|
/* HD derive new child key (on internal or external chain) */
|
||||||
void DeriveNewChildKey(const CKeyMetadata& metadata, CKey& secretRet, uint32_t nAccountIndex, bool fInternal /*= false*/);
|
void DeriveNewChildKey(const CKeyMetadata& metadata, CKey& secretRet, uint32_t nAccountIndex, bool fInternal /*= false*/);
|
||||||
|
|
||||||
|
bool fFileBacked;
|
||||||
public:
|
public:
|
||||||
/*
|
/*
|
||||||
* Main wallet lock.
|
* Main wallet lock.
|
||||||
@ -661,7 +662,6 @@ public:
|
|||||||
*/
|
*/
|
||||||
mutable CCriticalSection cs_wallet;
|
mutable CCriticalSection cs_wallet;
|
||||||
|
|
||||||
bool fFileBacked;
|
|
||||||
const std::string strWalletFile;
|
const std::string strWalletFile;
|
||||||
|
|
||||||
void LoadKeyPool(int nIndex, const CKeyPool &keypool)
|
void LoadKeyPool(int nIndex, const CKeyPool &keypool)
|
||||||
|
Loading…
Reference in New Issue
Block a user