From f94c2ecb48f2b3656f7412a010569eaf21fa83f5 Mon Sep 17 00:00:00 2001 From: Aaron Clauson Date: Sat, 18 Nov 2017 18:55:45 +1100 Subject: [PATCH] Fix for mismatched extern definition in wallet test classes which was breaking msvc linking. --- src/wallet/test/accounting_tests.cpp | 2 +- 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 a9cdc89e6..edbabcc92 100644 --- a/src/wallet/test/accounting_tests.cpp +++ b/src/wallet/test/accounting_tests.cpp @@ -10,7 +10,7 @@ #include -extern CWallet* pwalletMain; +extern std::unique_ptr 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 7ae1e74db..31b75120b 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -19,7 +19,7 @@ #include #include -extern CWallet* pwalletMain; +extern std::unique_ptr pwalletMain; extern UniValue importmulti(const JSONRPCRequest& request); extern UniValue dumpwallet(const JSONRPCRequest& request);