dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5513

Browse Source 
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)
This commit is contained in:
Wladimir J. van der Laan
2015-01-06 20:16:56 +01:00
parent 3b95808428 856e862f4a
commit 729ba31749
20 changed files with 90 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rpcwallet.cpp
View File

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