diff options
| author | winsvega <winsvega@mail.ru> | 2014-12-28 01:03:20 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2014-12-28 01:03:20 +0800 |
| commit | 6c2822eafde4507da98bbf85b5e9b809035518a7 (patch) | |
| tree | 74e47eb01634bb856f9f78935b91e8f05016a4db /jsonrpc.cpp | |
| parent | 7a396d07f5591d0ca6308f63c22401b51c62a485 (diff) | |
| parent | f4eab75fffb9c58e00e5cb114a70e4c4606699c5 (diff) | |
| download | dexon-solidity-6c2822eafde4507da98bbf85b5e9b809035518a7.tar dexon-solidity-6c2822eafde4507da98bbf85b5e9b809035518a7.tar.gz dexon-solidity-6c2822eafde4507da98bbf85b5e9b809035518a7.tar.bz2 dexon-solidity-6c2822eafde4507da98bbf85b5e9b809035518a7.tar.lz dexon-solidity-6c2822eafde4507da98bbf85b5e9b809035518a7.tar.xz dexon-solidity-6c2822eafde4507da98bbf85b5e9b809035518a7.tar.zst dexon-solidity-6c2822eafde4507da98bbf85b5e9b809035518a7.zip | |
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop
Diffstat (limited to 'jsonrpc.cpp')
| -rw-r--r-- | jsonrpc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/jsonrpc.cpp b/jsonrpc.cpp index 37377407..eed54ed8 100644 --- a/jsonrpc.cpp +++ b/jsonrpc.cpp @@ -19,6 +19,9 @@ * @date 2014 */ +// @debris disabled as tests fail with: +// unknown location(0): fatal error in "jsonrpc_setMining": std::exception: Exception -32003 : Client connector error: : libcurl error: 28 +// /home/gav/Eth/cpp-ethereum/test/jsonrpc.cpp(169): last checkpoint #if ETH_JSONRPC && 0 #include <boost/test/unit_test.hpp> @@ -29,7 +32,7 @@ #include <libwebthree/WebThree.h> #include <libweb3jsonrpc/WebThreeStubServer.h> #include <libweb3jsonrpc/CorsHttpServer.h> -#include <json/json.h> +//#include <json/json.h> #include <jsonrpccpp/server/connectors/httpserver.h> #include <jsonrpccpp/client/connectors/httpclient.h> #include <set> |