Merge pull request #545 from ewasm/cable-update

axic · web-flow · commit d77f71e0619d · 2019-09-12T18:36:11.000+01:00
Update to cable 0.4.4
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,13 +16,13 @@ include(Hunter/init)
 
 cable_configure_toolchain(DEFAULT cxx17-pic)
 
+cable_set_build_type(DEFAULT RelWithDebInfo CONFIGURATION_TYPES Debug;Release;RelWithDebInfo)
+
 set(CMAKE_DEBUG_POSTFIX "")
 
 project(hera)
 set(PROJECT_VERSION 0.2.5-alpha.0)
 
-cable_set_build_type(DEFAULT RelWithDebInfo CONFIGURATION_TYPES Debug;Release;RelWithDebInfo)
-
 cable_configure_compiler()
 if(CABLE_COMPILER_GNULIKE)
     # TODO: fix the warnings instead
diff --git a/cmake/cable b/cmake/cable
@@ -1 +1 @@
-Subproject commit eb2188b4c2a5580bc41e546ca61238222cd1fd4f
+Subproject commit 3fb12ab54d42ecebeedd399f9146f88b1f8fdcbc
diff --git a/src/helpers.cpp b/src/helpers.cpp
@@ -41,10 +41,10 @@ string toHex(evmc_uint256be const& value) {
   return "0x" + os.str();
 }
 
-string bytesAsHexStr(bytes_view bytes) {
+string bytesAsHexStr(bytes_view input) {
   stringstream ret;
   ret << hex << "0x";
-  for (auto const b : bytes) {
+  for (auto const b : input) {
     ret << setw(2) << setfill('0') << static_cast<int>(b);
   }
   return ret.str();

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ string toHex(evmc_uint256be const& value) {`
`41`	`41`	`return "0x" + os.str();`
`42`	`42`	`}`
`43`	`43`
`44`		`-string bytesAsHexStr(bytes_view bytes) {`
	`44`	`+string bytesAsHexStr(bytes_view input) {`
`45`	`45`	`stringstream ret;`
`46`	`46`	`ret << hex << "0x";`
`47`		`- for (auto const b : bytes) {`
	`47`	`+ for (auto const b : input) {`
`48`	`48`	`ret << setw(2) << setfill('0') << static_cast<int>(b);`
`49`	`49`	`}`
`50`	`50`	`return ret.str();`