Skip to content

Commit 49667a7

Browse files
committed
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
2 parents 9388639 + f94c2ec commit 49667a7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/wallet/test/accounting_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <boost/test/unit_test.hpp>
1212

13-
extern CWallet* pwalletMain;
13+
extern std::unique_ptr<CWallet> pwalletMain;
1414

1515
BOOST_FIXTURE_TEST_SUITE(accounting_tests, WalletTestingSetup)
1616

src/wallet/test/wallet_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <boost/test/unit_test.hpp>
2020
#include <univalue.h>
2121

22-
extern CWallet* pwalletMain;
22+
extern std::unique_ptr<CWallet> pwalletMain;
2323

2424
extern UniValue importmulti(const JSONRPCRequest& request);
2525
extern UniValue dumpwallet(const JSONRPCRequest& request);

0 commit comments

Comments
 (0)