diff options
| author | Christian <c@ethdev.com> | 2014-12-13 00:22:19 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-12-13 00:22:45 +0800 |
| commit | 7d8ec26141546cd965a1833348e44cdaecd57c96 (patch) | |
| tree | a21841707593dd030e25f1b1781c92f098a79a1e /jsonrpc.cpp | |
| parent | 7ad8f94a7e4990de96f23b794f454dc87f94f813 (diff) | |
| parent | 1705ea19274c22e58f43aee48f6c80750ff8fc93 (diff) | |
| download | dexon-solidity-7d8ec26141546cd965a1833348e44cdaecd57c96.tar dexon-solidity-7d8ec26141546cd965a1833348e44cdaecd57c96.tar.gz dexon-solidity-7d8ec26141546cd965a1833348e44cdaecd57c96.tar.bz2 dexon-solidity-7d8ec26141546cd965a1833348e44cdaecd57c96.tar.lz dexon-solidity-7d8ec26141546cd965a1833348e44cdaecd57c96.tar.xz dexon-solidity-7d8ec26141546cd965a1833348e44cdaecd57c96.tar.zst dexon-solidity-7d8ec26141546cd965a1833348e44cdaecd57c96.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_swapConstants
Conflicts:
test/solidityOptimizerTest.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> |