From 0250e516f9db3295b6260b591773b3527a4eda57 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 16 Jul 2015 01:29:03 +0200 Subject: [PATCH] All fields of BlockInfo now private. --- libevmjit-cpp/JitVM.cpp | 6 +++--- libevmjit/RuntimeManager.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libevmjit-cpp/JitVM.cpp b/libevmjit-cpp/JitVM.cpp index 2fb2a0e67..4e1fb66ea 100644 --- a/libevmjit-cpp/JitVM.cpp +++ b/libevmjit-cpp/JitVM.cpp @@ -24,7 +24,7 @@ bytesConstRef JitVM::execImpl(u256& io_gas, ExtVMFace& _ext, OnOpFunc const& _on rejected |= io_gas > std::numeric_limits::max(); // Do not accept requests with gas > 2^63 (int64 max) rejected |= _ext.gasPrice > std::numeric_limits::max(); rejected |= _ext.currentBlock.number > std::numeric_limits::max(); - rejected |= _ext.currentBlock.timestamp > std::numeric_limits::max(); + rejected |= _ext.currentBlock.timestamp() > std::numeric_limits::max(); if (rejected) { @@ -41,11 +41,11 @@ bytesConstRef JitVM::execImpl(u256& io_gas, ExtVMFace& _ext, OnOpFunc const& _on m_data.caller = eth2jit(fromAddress(_ext.caller)); m_data.origin = eth2jit(fromAddress(_ext.origin)); m_data.callValue = eth2jit(_ext.value); - m_data.coinBase = eth2jit(fromAddress(_ext.currentBlock.coinbaseAddress)); + m_data.coinBase = eth2jit(fromAddress(_ext.currentBlock.coinbaseAddress())); m_data.difficulty = eth2jit(_ext.currentBlock.difficulty); m_data.gasLimit = eth2jit(_ext.currentBlock.gasLimit); m_data.number = static_cast(_ext.currentBlock.number); - m_data.timestamp = static_cast(_ext.currentBlock.timestamp); + m_data.timestamp() = static_cast(_ext.currentBlock.timestamp()); m_data.code = _ext.code.data(); m_data.codeSize = _ext.code.size(); m_data.codeHash = eth2jit(_ext.codeHash); diff --git a/libevmjit/RuntimeManager.cpp b/libevmjit/RuntimeManager.cpp index d48b64bb1..b2c15d7ae 100644 --- a/libevmjit/RuntimeManager.cpp +++ b/libevmjit/RuntimeManager.cpp @@ -1,7 +1,7 @@ #include "RuntimeManager.h" -#include "preprocessor/llvm_includes_start.h" -#include +#include "preprocessor/llvm_includes_start.h" +#include #include "preprocessor/llvm_includes_end.h" #include "Stack.h" @@ -77,7 +77,7 @@ llvm::Twine getName(RuntimeData::Index _index) case RuntimeData::Difficulty: return "block.difficulty"; case RuntimeData::GasLimit: return "block.gaslimit"; case RuntimeData::Number: return "block.number"; - case RuntimeData::Timestamp: return "block.timestamp"; + case RuntimeData::Timestamp: return "block.timestamp()"; case RuntimeData::Code: return "code.ptr"; case RuntimeData::CodeSize: return "code.size"; }