diff options
| author | Dimitry <winsvega@mail.ru> | 2016-04-02 20:56:43 +0800 |
|---|---|---|
| committer | Dimitry <winsvega@mail.ru> | 2016-04-02 20:56:43 +0800 |
| commit | 858c41260d4cec26ba38ea3bd2ef71dcede63f7c (patch) | |
| tree | 8dd03312a5f926f8dd95a4a7f0798c2b6624c1e3 /libsolidity/interface | |
| parent | ccbd3ff63feb696025c18211c3c93bab47f755b0 (diff) | |
| download | dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.gz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.zst dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.zip | |
rename namespace for instruction.h/cpp in libevmasm
Diffstat (limited to 'libsolidity/interface')
| -rw-r--r-- | libsolidity/interface/GasEstimator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp index d460ba76..f634a96d 100644 --- a/libsolidity/interface/GasEstimator.cpp +++ b/libsolidity/interface/GasEstimator.cpp @@ -137,8 +137,8 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation( using Id = ExpressionClasses::Id; using Ids = vector<Id>; Id hashValue = classes.find(u256(FixedHash<4>::Arith(FixedHash<4>(dev::sha3(_signature))))); - Id calldata = classes.find(eth::Instruction::CALLDATALOAD, Ids{classes.find(u256(0))}); - classes.forceEqual(hashValue, eth::Instruction::DIV, Ids{ + Id calldata = classes.find(solidity::Instruction::CALLDATALOAD, Ids{classes.find(u256(0))}); + classes.forceEqual(hashValue, solidity::Instruction::DIV, Ids{ calldata, classes.find(u256(1) << (8 * 28)) }); @@ -165,7 +165,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation( AssemblyItem invalidTag(PushTag, u256(-0x10)); state->feedItem(invalidTag, true); if (parametersSize > 0) - state->feedItem(eth::swapInstruction(parametersSize)); + state->feedItem(solidity::swapInstruction(parametersSize)); return PathGasMeter(_items).estimateMax(_offset, state); } |