diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-07 13:02:35 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-07 13:54:09 +0200 |
| commit | 9abdb7c67e4ae48f7e4650372d9b17be6ebdc04e (patch) | |
| tree | 573bad6ae0e6e39d703ceca0ed0be93d3b642e94 /src/wallet/wallet.cpp | |
| parent | 5f0c6a7b0e47e03f848dc992d37fe209dd9c6975 (diff) | |
| parent | d894894aab78dbd5e32267313237648933248377 (diff) | |
Merge #12836: Make WalletInitInterface and DummyWalletInit private, fix nullptr deref
d894894 wallet: Refactor to WalletInitInterface* const g_wallet_init_interface (João Barbosa)
39bc2fa wallet: Make WalletInitInterface and DummyWalletInit private (João Barbosa)
Pull request description:
Implementations of `WalletInitInterface` don't have to be public, so make them private. This makes the interface instantiation static. Also reduces `ENABLE_WALLET` usage and removes the unnecessary `src/wallet/init.h` header.
Tree-SHA512: 203c49d8c85252d1bd0ff1d7ed8bcdc842d12d2d396e965cc70be5c8159a62e98ec23d32d2f3dc48a53e575844130d0a7dedac3cc2fe4621d31319b7a1c9ba89
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index dbc1760c80..8dac547abb 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -12,7 +12,6 @@ #include <consensus/consensus.h> #include <consensus/validation.h> #include <fs.h> -#include <wallet/init.h> #include <key.h> #include <key_io.h> #include <keystore.h> |