diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-11-18 14:03:04 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-11-18 14:03:12 +0100 |
| commit | 49667a77e76aa709717a09916b55ff671e9c6704 (patch) | |
| tree | b8a6282be876ffee7a5cbcd727f863ed3e26fb7e /src/wallet/test/wallet_tests.cpp | |
| parent | Merge #11710: cli: Reject arguments to -getinfo (diff) | |
| parent | Fix for mismatched extern definition in wallet test classes which was breakin... (diff) | |
| download | discoin-49667a77e76aa709717a09916b55ff671e9c6704.tar.xz discoin-49667a77e76aa709717a09916b55ff671e9c6704.zip | |
Merge #11713: Fix for mismatched extern definition in wallet tests
f94c2ec Fix for mismatched extern definition in wallet test classes which was breaking msvc linking. (Aaron Clauson)
Pull request description:
The extern declarations are using a raw pointer which doesn't match the source variable's std::unqiue_ptr.
Tree-SHA512: 1500ffa1282ee6565741bf2f8f9def68a355346c8e4a667e1167d3d550eb0b732e8cba52fbef380a92c860e686d36da877d800ee5f2fc1e4dd8fd88fbe170644
Diffstat (limited to 'src/wallet/test/wallet_tests.cpp')
| -rw-r--r-- | src/wallet/test/wallet_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 7ae1e74db..31b75120b 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -19,7 +19,7 @@ #include <boost/test/unit_test.hpp> #include <univalue.h> -extern CWallet* pwalletMain; +extern std::unique_ptr<CWallet> pwalletMain; extern UniValue importmulti(const JSONRPCRequest& request); extern UniValue dumpwallet(const JSONRPCRequest& request); |