diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-12 14:03:51 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-12 14:37:28 +0200 |
| commit | 9b638c7ce1b93c996b49f02c0bcefb25b6200d8e (patch) | |
| tree | c60489fb61b6a84ef5c1463fbbb84387f72d3dd5 /src/wallet | |
| parent | d3dae3ddf9fa95d652dfdf44bb496617513644a2 (diff) | |
| parent | d0b9405f964670d6eaa8529f65fa7993b2a406c8 (diff) | |
Merge #13627: Free keystore.h from file scope level type aliases
d0b9405f964670d6eaa8529f65fa7993b2a406c8 Refactors `keystore.h` type aliases. (251)
Pull request description:
This pull request frees `keystore.h` from type alias declarations that have been declared at file scope level.
`keystore.h` has various type aliases that have been declared ~3 - 6 years ago at file scope level, which can either be encapsulated or removed.
Where type alias declarations are encapsulated at the appropriate scope and access level, C++11's `using` notation is used in favor of the `typedef` notation.
Tree-SHA512: 1395cdc63e0c7ff5a1b1721675ad4416f71f507e999bd4ba019f03457cbfc08877848f10a8db7f5ccd2cd5ca3f5a291c986616f7703172fb6d79fba7447ffba8
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/crypter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index b0a75b7020..52842cd978 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -126,6 +126,8 @@ private: bool fDecryptionThoroughlyChecked; protected: + using CryptedKeyMap = std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char>>>; + bool SetCrypted(); //! will encrypt previously unencrypted keys |