Merge remote-tracking branch 'upstream/develop' into evmjit

Conflicts: evmjit/libevmjit/Utils.h
10 years ago · e9ce09b84d
2 changed files with 4 additions and 1 deletions
--- a/libevmjit/ExecutionEngine.cpp
+++ b/libevmjit/ExecutionEngine.cpp
@ -28,7 +28,7 @@ namespace jit

 namespace
 {
-typedef ReturnCode(*EntryFuncPtr)(Runtime*);
+using EntryFuncPtr = ReturnCode(*)(Runtime*);

 std::string codeHash(i256 const& _hash)
 {
--- a/libevmjit/Utils.h
+++ b/libevmjit/Utils.h
@ -1,4 +1,7 @@
 #pragma once
+
+#include <iostream>
+
 #include "Common.h"

 namespace dev