Merge pull request ethereum#7827 from ethereum/jsoncpp

Update to jsoncpp 1.9.2
CNFS-Tech · Nov 29, 2019 · c6c5a6f · c6c5a6f
2 parents 7b038db + 4edab3d
commit c6c5a6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
@@ -37,9 +37,9 @@ endif()
 ExternalProject_Add(jsoncpp-project
     PREFIX "${prefix}"
     DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads"
-    DOWNLOAD_NAME jsoncpp-1.8.4.tar.gz
-    URL https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz
-    URL_HASH SHA256=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
+    DOWNLOAD_NAME jsoncpp-1.9.2.tar.gz
+    URL https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz
+    URL_HASH SHA256=77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0
     CMAKE_COMMAND ${JSONCPP_CMAKE_COMMAND}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

diff --git a/libdevcore/JSON.cpp b/libdevcore/JSON.cpp
@@ -32,8 +32,8 @@
 using namespace std;
 
 static_assert(
-	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 8) && (JSONCPP_VERSION_PATCH == 4),
-	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.8.4."
+	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 2),
+	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.2."
 );
 
 namespace dev