diff options
| author | chriseth <chris@ethereum.org> | 2018-05-16 20:43:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 20:43:57 +0800 |
| commit | e67f0147998a9e3835ed3ce8bf6a0a0c634216c5 (patch) | |
| tree | b9c0b7d41cd9f78ae3404704a888da30e767edbe /libdevcore/JSON.cpp | |
| parent | 124ca40dc525a987a88176c6e5170978e82fa290 (diff) | |
| parent | 1e45d3ab2e0ca688c2ae48ab657f11496ccebc12 (diff) | |
| download | dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.gz dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.bz2 dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.lz dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.xz dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.zst dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.zip | |
Merge pull request #4148 from ethereum/develop
Merge develop into release for 0.4.24
Diffstat (limited to 'libdevcore/JSON.cpp')
| -rw-r--r-- | libdevcore/JSON.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libdevcore/JSON.cpp b/libdevcore/JSON.cpp index d99b3bc6..6317cc89 100644 --- a/libdevcore/JSON.cpp +++ b/libdevcore/JSON.cpp @@ -28,8 +28,8 @@ using namespace std; static_assert( - (JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 7) && (JSONCPP_VERSION_PATCH == 7), - "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.7.7." + (JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 8) && (JSONCPP_VERSION_PATCH == 4), + "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.8.4." ); namespace dev |