diff options
| author | sveneh <sven@ethdev.com> | 2014-12-13 06:42:28 +0800 |
|---|---|---|
| committer | sveneh <sven@ethdev.com> | 2014-12-13 06:42:28 +0800 |
| commit | 8e9659752d9e0b7c100d582c2d391a1992f628fe (patch) | |
| tree | 08fb1b0128fb37ee6d8753463ab001e85a18c8fe /jsonrpc.cpp | |
| parent | 84b0fc08b772c4d551ce8ab18879eb3a22fc8ca6 (diff) | |
| parent | dd309de94c2cd6a5d77be877e4f30b5a70d725f5 (diff) | |
| download | dexon-solidity-8e9659752d9e0b7c100d582c2d391a1992f628fe.tar.gz dexon-solidity-8e9659752d9e0b7c100d582c2d391a1992f628fe.tar.zst dexon-solidity-8e9659752d9e0b7c100d582c2d391a1992f628fe.zip | |
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
Conflicts:
windows/LibEthereum.vcxproj
windows/LibEthereum.vcxproj.filters
Solved by removing files (not necessary anymore)
Diffstat (limited to 'jsonrpc.cpp')
| -rw-r--r-- | jsonrpc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jsonrpc.cpp b/jsonrpc.cpp index 5a9b94eb..37377407 100644 --- a/jsonrpc.cpp +++ b/jsonrpc.cpp @@ -19,7 +19,7 @@ * @date 2014 */ -#if ETH_JSONRPC +#if ETH_JSONRPC && 0 #include <boost/test/unit_test.hpp> #include <boost/lexical_cast.hpp> @@ -44,7 +44,7 @@ using namespace dev; using namespace dev::eth; namespace js = json_spirit; -WebThreeDirect *web3; +WebThreeDirect* web3; unique_ptr<WebThreeStubServer> jsonrpcServer; unique_ptr<WebThreeStubClient> jsonrpcClient; |