From 0d32f766eb51f2afd7e89f8c6e9f10d0d4781e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Mon, 19 Jan 2015 18:39:19 +0100
Subject: [PATCH] Removing boost dependency from libevmjit

---
 evmjit/CMakeLists.txt               | 3 ---
 evmjit/libevmjit-cpp/CMakeLists.txt | 3 +++
 evmjit/libevmjit/CMakeLists.txt     | 1 -
 evmjit/libevmjit/Common.h           | 4 +---
 evmjit/libevmjit/Compiler.cpp       | 1 +
 evmjit/libevmjit/interface.cpp      | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/evmjit/CMakeLists.txt b/evmjit/CMakeLists.txt
index 519346007..4888de523 100644
--- a/evmjit/CMakeLists.txt
+++ b/evmjit/CMakeLists.txt
@@ -32,9 +32,6 @@ else()
 	link_directories(/usr/lib/llvm-3.5/lib)
 endif()
 
-# Boost
-find_package(Boost REQUIRED)
-
 add_subdirectory(libevmjit)
 
 if(EVMJIT_CPP)
diff --git a/evmjit/libevmjit-cpp/CMakeLists.txt b/evmjit/libevmjit-cpp/CMakeLists.txt
index 25be95177..58375e4ee 100644
--- a/evmjit/libevmjit-cpp/CMakeLists.txt
+++ b/evmjit/libevmjit-cpp/CMakeLists.txt
@@ -1,5 +1,8 @@
 set(TARGET_NAME evmjit-cpp)
 
+# Boost
+find_package(Boost REQUIRED)
+
 set(SOURCES
     Env.cpp     
     JitVM.cpp   JitVM.h
diff --git a/evmjit/libevmjit/CMakeLists.txt b/evmjit/libevmjit/CMakeLists.txt
index 96ec873f5..1990ec398 100644
--- a/evmjit/libevmjit/CMakeLists.txt
+++ b/evmjit/libevmjit/CMakeLists.txt
@@ -15,7 +15,6 @@ add_library(${TARGET_NAME} SHARED ${SOURCES} ${HEADERS})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "libs")
 
 include_directories(${LLVM_INCLUDE_DIRS})
-include_directories(${Boost_INCLUDE_DIRS})
 
 target_link_libraries(${TARGET_NAME} PRIVATE ${LLVM_LIBS})
 target_link_libraries(${TARGET_NAME} PRIVATE gmp)
diff --git a/evmjit/libevmjit/Common.h b/evmjit/libevmjit/Common.h
index 179c7ab38..d0c582236 100644
--- a/evmjit/libevmjit/Common.h
+++ b/evmjit/libevmjit/Common.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include <boost/multiprecision/cpp_int.hpp>
+#include <tuple>
 
 namespace dev
 {
@@ -13,8 +13,6 @@ namespace jit
 using byte = uint8_t;
 using bytes = std::vector<byte>;
 using bytes_ref = std::tuple<byte const*, size_t>;
-using u256 = boost::multiprecision::uint256_t;
-using bigint = boost::multiprecision::cpp_int;
 
 struct NoteChannel {};	// FIXME: Use some log library?
 
diff --git a/evmjit/libevmjit/Compiler.cpp b/evmjit/libevmjit/Compiler.cpp
index 1d00fd225..6286ef92f 100644
--- a/evmjit/libevmjit/Compiler.cpp
+++ b/evmjit/libevmjit/Compiler.cpp
@@ -4,6 +4,7 @@
 #include <functional>
 #include <fstream>
 #include <chrono>
+#include <sstream>
 
 #include <llvm/ADT/PostOrderIterator.h>
 #include <llvm/IR/CFG.h>
diff --git a/evmjit/libevmjit/interface.cpp b/evmjit/libevmjit/interface.cpp
index 7f334fa14..5d2b97c2d 100644
--- a/evmjit/libevmjit/interface.cpp
+++ b/evmjit/libevmjit/interface.cpp
@@ -1,5 +1,5 @@
 #include "interface.h"
-#include <cstdio>
+#include <cstring>
 #include "ExecutionEngine.h"
 
 extern "C"