diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2014-12-13 04:02:41 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2014-12-13 04:02:41 +0800 |
| commit | bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6 (patch) | |
| tree | a21841707593dd030e25f1b1781c92f098a79a1e /jsonrpc.cpp | |
| parent | 2a4e8228d7e912febdd6c4570a9143ea9bed11d9 (diff) | |
| parent | 7d8ec26141546cd965a1833348e44cdaecd57c96 (diff) | |
| download | dexon-solidity-bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6.tar dexon-solidity-bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6.tar.gz dexon-solidity-bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6.tar.bz2 dexon-solidity-bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6.tar.lz dexon-solidity-bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6.tar.xz dexon-solidity-bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6.tar.zst dexon-solidity-bdb3a6d9465a71dc7f73c7f538bdbef54388f6e6.zip | |
Merge remote-tracking branch 'upstream/develop' into fixTest
Conflicts:
test/trie.cpp
Diffstat (limited to 'jsonrpc.cpp')
| -rw-r--r-- | jsonrpc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jsonrpc.cpp b/jsonrpc.cpp index d17c5a59..20ffc6d5 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> |