From 1fa1894ee769255726d565f6f76f99d246adb3c5 Mon Sep 17 00:00:00 2001 From: rodiazet Date: Mon, 3 Dec 2018 15:46:51 +0100 Subject: [PATCH 1/2] Fix u256 to string conversion --- libevmasm/Assembly.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index b71bc80cb..80bac3867 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -264,7 +264,7 @@ Json::Value Assembly::assemblyJSON(StringMap const& _sourceCodes) const createJsonValue("PUSH [ErrorTag]", i.location().start, i.location().end, "")); else collection.append( - createJsonValue("PUSH [tag]", i.location().start, i.location().end, string(i.data()))); + createJsonValue("PUSH [tag]", i.location().start, i.location().end, toString(i.data()))); break; case PushSub: collection.append( @@ -290,7 +290,7 @@ Json::Value Assembly::assemblyJSON(StringMap const& _sourceCodes) const break; case Tag: collection.append( - createJsonValue("tag", i.location().start, i.location().end, string(i.data()))); + createJsonValue("tag", i.location().start, i.location().end, toString(i.data()))); collection.append( createJsonValue("JUMPDEST", i.location().start, i.location().end)); break; From 8c4d9e8cfd9fb91682cdc8296393729c95a91ed4 Mon Sep 17 00:00:00 2001 From: rodiazet Date: Mon, 3 Dec 2018 15:48:39 +0100 Subject: [PATCH 2/2] Fix unsed variable warning --- libsolidity/inlineasm/AsmParser.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index d3b0808b4..db1c57370 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -606,7 +606,8 @@ bool Parser::isValidNumberLiteral(string const& _literal) { try { - u256(_literal); + u256 v(_literal); + (void)v; } catch (...) {