diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2014-08-20 15:15:16 -0400 |
|---|---|---|
| committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-04 09:16:05 +0200 |
| commit | 15982a8b69ec6ab3c3a6bf71fc6a9b681d3ff541 (patch) | |
| tree | 854a48a039d4199dbc1acf33ef94d06d007f1348 /src/rpcmisc.cpp | |
| parent | 5e3060c0d104c734e7e2a200e2d937ea01166c8a (diff) | |
| download | bitcoin-15982a8b69ec6ab3c3a6bf71fc6a9b681d3ff541.tar.xz | |
Convert tree to using univalue. Eliminate all json_spirit uses.
Diffstat (limited to 'src/rpcmisc.cpp')
| -rw-r--r-- | src/rpcmisc.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index f5bef2a077..f7bd3e0d5a 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -20,8 +20,7 @@ #include <stdint.h> #include <boost/assign/list_of.hpp> -#include "json/json_spirit_utils.h" -#include "json/json_spirit_value.h" +#include "json_spirit_wrapper.h" using namespace json_spirit; using namespace std; @@ -204,7 +203,7 @@ Value validateaddress(const Array& params, bool fHelp) if (mine != ISMINE_NO) { ret.push_back(Pair("iswatchonly", (mine & ISMINE_WATCH_ONLY) ? true: false)); Object detail = boost::apply_visitor(DescribeAddressVisitor(mine), dest); - ret.insert(ret.end(), detail.begin(), detail.end()); + ret.pushKVs(detail); } if (pwalletMain && pwalletMain->mapAddressBook.count(dest)) ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name)); |