diff options
| author | chriseth <chris@ethereum.org> | 2018-12-20 01:06:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 01:06:13 +0800 |
| commit | 1df8f40cd2fd7b47698d847907b8ca7b47eb488d (patch) | |
| tree | 5ed5816fe2d1a8a207e750d39884aca7957c8289 /libsolidity/interface/GasEstimator.h | |
| parent | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (diff) | |
| parent | ddf54b21d1d002903624f61173ab4af197f50053 (diff) | |
| download | dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.gz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.bz2 dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.lz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.xz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.zst dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.zip | |
Merge pull request #5697 from ethereum/develop
Merge develop into release for 0.5.2
Diffstat (limited to 'libsolidity/interface/GasEstimator.h')
| -rw-r--r-- | libsolidity/interface/GasEstimator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/interface/GasEstimator.h b/libsolidity/interface/GasEstimator.h index 214a3e58..f40cffeb 100644 --- a/libsolidity/interface/GasEstimator.h +++ b/libsolidity/interface/GasEstimator.h @@ -24,12 +24,12 @@ #include <liblangutil/EVMVersion.h> -#include <libevmasm/GasMeter.h> #include <libevmasm/Assembly.h> +#include <libevmasm/GasMeter.h> -#include <vector> -#include <map> #include <array> +#include <map> +#include <vector> namespace dev { |