diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-23 01:24:02 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-09-20 08:23:21 +0800 |
| commit | aad829948a7b21d7664a43c1127679b53ae40bdc (patch) | |
| tree | 9809a49c773d3e7cfbe2bb2c1db926ad0b6810ca /libevmasm | |
| parent | 137b214be471dd690aeadaf0e02b9ad0915d9e84 (diff) | |
| download | dexon-solidity-aad829948a7b21d7664a43c1127679b53ae40bdc.tar.gz dexon-solidity-aad829948a7b21d7664a43c1127679b53ae40bdc.tar.zst dexon-solidity-aad829948a7b21d7664a43c1127679b53ae40bdc.zip | |
Ensure parameter names match between headers and implementation
Diffstat (limited to 'libevmasm')
| -rw-r--r-- | libevmasm/ConstantOptimiser.h | 2 | ||||
| -rw-r--r-- | libevmasm/GasMeter.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h index 82982e25..c450b0b4 100644 --- a/libevmasm/ConstantOptimiser.h +++ b/libevmasm/ConstantOptimiser.h @@ -91,7 +91,7 @@ protected: } /// Replaces all constants i by the code given in @a _replacement[i]. - static void replaceConstants(AssemblyItems& _items, std::map<u256, AssemblyItems> const& _replacement); + static void replaceConstants(AssemblyItems& _items, std::map<u256, AssemblyItems> const& _replacements); Params m_params; u256 const& m_value; diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index 6a7c80e0..dad952bc 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -189,9 +189,9 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ return gas; } -GasMeter::GasConsumption GasMeter::wordGas(u256 const& _multiplier, ExpressionClasses::Id _position) +GasMeter::GasConsumption GasMeter::wordGas(u256 const& _multiplier, ExpressionClasses::Id _value) { - u256 const* value = m_state->expressionClasses().knownConstant(_position); + u256 const* value = m_state->expressionClasses().knownConstant(_value); if (!value) return GasConsumption::infinite(); return GasConsumption(_multiplier * ((*value + 31) / 32)); |