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
This commit is contained in:
Wladimir J. van der Laan 2017-11-18 14:03:04 +01:00
commit 49667a77e7
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
2 changed files with 2 additions and 2 deletions

View file

@ -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)

View file

@ -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);