diff options
| -rw-r--r-- | SolidityABIJSON.cpp | 2 | ||||
| -rw-r--r-- | SolidityEndToEndTest.cpp | 6 | ||||
| -rw-r--r-- | SolidityNatspecJSON.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/SolidityABIJSON.cpp b/SolidityABIJSON.cpp index 242a88e7..10873b5a 100644 --- a/SolidityABIJSON.cpp +++ b/SolidityABIJSON.cpp @@ -22,7 +22,7 @@ #include <boost/test/unit_test.hpp> #include <libsolidity/CompilerStack.h> -#include <jsoncpp/json/json.h> +#include <json/json.h> #include <libdevcore/Exceptions.h> namespace dev diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp index 71cb4a6f..587d4193 100644 --- a/SolidityEndToEndTest.cpp +++ b/SolidityEndToEndTest.cpp @@ -963,7 +963,7 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors) compileAndRun(sourceCode); BOOST_CHECK(callContractFunction("data()") == encodeArgs(8)); BOOST_CHECK(callContractFunction("name()") == encodeArgs("Celina")); - BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(bytes{0x7b}))); + BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(bytes(1, 0x7b)))); BOOST_CHECK(callContractFunction("an_address()") == encodeArgs(toBigEndian(u160(0x1337)))); BOOST_CHECK(callContractFunction("super_secret_data()") == bytes()); } @@ -2203,7 +2203,7 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_numeric_literals) dev::sha3( toBigEndian(u256(10)) + bytes{0x0, 0xc} + - bytes{0x91}))); + bytes(1, 0x91)))); } BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals) @@ -2227,7 +2227,7 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals) dev::sha3( toBigEndian(u256(10)) + bytes{0x0, 0xc} + - bytes{0x91} + + bytes(1, 0x91) + bytes{0x66, 0x6f, 0x6f}))); } diff --git a/SolidityNatspecJSON.cpp b/SolidityNatspecJSON.cpp index b652ad10..d1a443c2 100644 --- a/SolidityNatspecJSON.cpp +++ b/SolidityNatspecJSON.cpp @@ -21,7 +21,7 @@ */ #include <boost/test/unit_test.hpp> -#include <jsoncpp/json/json.h> +#include <json/json.h> #include <libsolidity/CompilerStack.h> #include <libsolidity/Exceptions.h> #include <libdevcore/Exceptions.h> |