From 8a5228197cec2e65f53bffe269c08ce94c440048 Mon Sep 17 00:00:00 2001 From: Karl-Johan Alm Date: Fri, 27 Jan 2017 10:33:45 +0900 Subject: Refactor: Remove using namespace from wallet/ --- src/wallet/test/wallet_tests.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/wallet/test') diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 42b67fac39..c94491ca21 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -27,16 +27,14 @@ extern UniValue importmulti(const JSONRPCRequest& request); // we repeat those tests this many times and only complain if all iterations of the test fail #define RANDOM_REPEATS 5 -using namespace std; - std::vector> wtxn; -typedef set > CoinSet; +typedef std::set > CoinSet; BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup) static const CWallet testWallet; -static vector vCoins; +static std::vector vCoins; static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = false, int nInput=0) { @@ -69,7 +67,7 @@ static void empty_wallet(void) static bool equal_sets(CoinSet a, CoinSet b) { - pair ret = mismatch(a.begin(), a.end(), b.begin()); + std::pair ret = mismatch(a.begin(), a.end(), b.begin()); return ret.first == a.end() && ret.second == b.end(); } -- cgit v1.2.3