diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-06 20:16:56 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-06 20:32:45 +0100 |
commit | 729ba317498bf644c62975dbde07da5ab9ef0043 (patch) | |
tree | 84076d547fd499ff98cffac6a9343bccfb451081 /src/rpcwallet.cpp | |
parent | 3b95808428c16b2276cf1a6416d0c01ae515e81a (diff) | |
parent | 856e862f4a736fbdc38daae3b7f0fa34e1da317c (diff) | |
download | bitcoin-729ba317498bf644c62975dbde07da5ab9ef0043.tar.xz |
Merge pull request #5513
856e862 namespace: drop most boost namespaces and a few header cleanups (Cory Fields)
9b1ab86 namespace: drop boost::assign altogether here (Cory Fields)
a324199 namespace: remove boost namespace pollution (Cory Fields)
Diffstat (limited to 'src/rpcwallet.cpp')
-rw-r--r-- | src/rpcwallet.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 470a48e4fb..7a4d685717 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -23,8 +23,6 @@ #include "json/json_spirit_value.h" using namespace std; -using namespace boost; -using namespace boost::assign; using namespace json_spirit; int64_t nWalletUnlockTime; @@ -1873,9 +1871,9 @@ Value lockunspent(const Array& params, bool fHelp) ); if (params.size() == 1) - RPCTypeCheck(params, list_of(bool_type)); + RPCTypeCheck(params, boost::assign::list_of(bool_type)); else - RPCTypeCheck(params, list_of(bool_type)(array_type)); + RPCTypeCheck(params, boost::assign::list_of(bool_type)(array_type)); bool fUnlock = params[0].get_bool(); @@ -1892,7 +1890,7 @@ Value lockunspent(const Array& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected object"); const Object& o = output.get_obj(); - RPCTypeCheck(o, map_list_of("txid", str_type)("vout", int_type)); + RPCTypeCheck(o, boost::assign::map_list_of("txid", str_type)("vout", int_type)); string txid = find_value(o, "txid").get_str(); if (!IsHex(txid)) |