diff options
| author | Aaron Clauson <aaron@sipsorcery.com> | 2017-11-18 18:55:45 +1100 |
|---|---|---|
| committer | Aaron Clauson <aaron@sipsorcery.com> | 2017-11-18 18:55:45 +1100 |
| commit | f94c2ecb48f2b3656f7412a010569eaf21fa83f5 (patch) | |
| tree | 3d3743b1599217aa4bbc75ea2905920ba01aef50 | |
| parent | 142913296f006650127b7a2ef03954e46bfd585c (diff) | |
| download | bitcoin-f94c2ecb48f2b3656f7412a010569eaf21fa83f5.tar.xz | |
Fix for mismatched extern definition in wallet test classes which was breaking msvc linking.
| -rw-r--r-- | src/wallet/test/accounting_tests.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/test/wallet_tests.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp index a9cdc89e6f..edbabcc921 100644 --- a/src/wallet/test/accounting_tests.cpp +++ b/src/wallet/test/accounting_tests.cpp @@ -10,7 +10,7 @@ #include <boost/test/unit_test.hpp> -extern CWallet* pwalletMain; +extern std::unique_ptr<CWallet> pwalletMain; BOOST_FIXTURE_TEST_SUITE(accounting_tests, WalletTestingSetup) diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 7ae1e74dbe..31b75120b4 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); |