diff options
| author | chriseth <chris@ethereum.org> | 2018-03-05 19:10:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 19:10:49 +0800 |
| commit | 6dc137317fa8249a9c1b19ff6430840974393f90 (patch) | |
| tree | 2263fd97b42da5673b1dcce24ab4419ce8dc67b9 /libsolidity/codegen/ContractCompiler.h | |
| parent | e3c2ab39a125e68aea07ba9c8cacb0a55293bf0d (diff) | |
| parent | 6ec4517929e8c0eca022f4771ba217db5d80beed (diff) | |
| download | dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.gz dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.bz2 dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.lz dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.xz dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.zst dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.zip | |
Merge pull request #3569 from ethereum/evmVersion
EVM version
Diffstat (limited to 'libsolidity/codegen/ContractCompiler.h')
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/codegen/ContractCompiler.h b/libsolidity/codegen/ContractCompiler.h index d698dc71..8559ea58 100644 --- a/libsolidity/codegen/ContractCompiler.h +++ b/libsolidity/codegen/ContractCompiler.h @@ -43,7 +43,7 @@ public: m_runtimeCompiler(_runtimeCompiler), m_context(_context) { - m_context = CompilerContext(_runtimeCompiler ? &_runtimeCompiler->m_context : nullptr); + m_context = CompilerContext(_context.evmVersion(), _runtimeCompiler ? &_runtimeCompiler->m_context : nullptr); } void compileContract( @@ -125,7 +125,7 @@ private: void compileExpression(Expression const& _expression, TypePointer const& _targetType = TypePointer()); /// @returns the runtime assembly for clone contracts. - static eth::AssemblyPointer cloneRuntime(); + eth::AssemblyPointer cloneRuntime() const; bool const m_optimise; /// Pointer to the runtime compiler in case this is a creation compiler. |