diff options
| author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-05-18 14:02:18 +0200 |
|---|---|---|
| committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-04 09:16:21 +0200 |
| commit | 9a8897f4ac992741e153d88b54bd2cde877c713d (patch) | |
| tree | e827981679708bae6bef1516d69efda3524b719f /src/qt/rpcconsole.cpp | |
| parent | 3df0411ad9fd75fb27af53e44835d41f5480fe3f (diff) | |
| download | bitcoin-9a8897f4ac992741e153d88b54bd2cde877c713d.tar.xz | |
Remove JSON Spirit wrapper, remove JSON Spirit leftovers
- implement find_value() function for UniValue
- replace all Array/Value/Object types with UniValues, remove JSON Spirit to UniValue wrapper
- remove JSON Spirit sources
Diffstat (limited to 'src/qt/rpcconsole.cpp')
| -rw-r--r-- | src/qt/rpcconsole.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 29b1e8f262..d7be531b2d 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -181,11 +181,7 @@ void RPCExecutor::request(const QString &command) emit reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint)); } -<<<<<<< HEAD - catch (const json_spirit::Object& objError) -======= catch (UniValue& objError) ->>>>>>> Convert tree to using univalue. Eliminate all json_spirit uses. { try // Nice formatting for standard-format error { |