Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

evmjit/libevmjit/CompilerHelper.h

@@ -49,7 +49,15 @@ private:
 	RuntimeManager& m_runtimeManager;
 };
 
-using InsertPointGuard = llvm::IRBuilderBase::InsertPointGuard;
+struct InsertPointGuard
+{
+	explicit InsertPointGuard(llvm::IRBuilderBase& _builder): m_builder(_builder), m_insertPoint(_builder.saveIP()) {}
+	~InsertPointGuard() { m_builder.restoreIP(m_insertPoint); }
+
+private:
+	llvm::IRBuilderBase& m_builder;
+	llvm::IRBuilderBase::InsertPoint m_insertPoint;
+};
 
 }
 }

evmjit/libevmjit/preprocessor/llvm_includes_start.h

@@ -1,6 +1,6 @@
 #if defined(_MSC_VER)
 	#pragma warning(push)
-	#pragma warning(disable: 4267 4244 4800)
+	#pragma warning(disable: 4267 4244 4800 4624)
 #elif defined(__clang__)
 	#pragma clang diagnostic push
 	#pragma clang diagnostic ignored "-Wunused-parameter"