diff options
| author | Christian <c@ethdev.com> | 2014-11-11 17:39:59 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-11-11 17:39:59 +0800 |
| commit | d1789250b66f79ab45bc8469eedba410f4ae388f (patch) | |
| tree | 3205ad7f977d2b99b6a6c92175d2d58c5b822502 /Compiler.cpp | |
| parent | 41b26e491b9a4eaa1ef481e7e57ebc1111315033 (diff) | |
| parent | a0c72065fee89c4558eeb4a98e5273633635bc39 (diff) | |
| download | dexon-solidity-d1789250b66f79ab45bc8469eedba410f4ae388f.tar dexon-solidity-d1789250b66f79ab45bc8469eedba410f4ae388f.tar.gz dexon-solidity-d1789250b66f79ab45bc8469eedba410f4ae388f.tar.bz2 dexon-solidity-d1789250b66f79ab45bc8469eedba410f4ae388f.tar.lz dexon-solidity-d1789250b66f79ab45bc8469eedba410f4ae388f.tar.xz dexon-solidity-d1789250b66f79ab45bc8469eedba410f4ae388f.tar.zst dexon-solidity-d1789250b66f79ab45bc8469eedba410f4ae388f.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_jumptable
Conflicts:
libsolidity/Compiler.cpp
Diffstat (limited to 'Compiler.cpp')
| -rw-r--r-- | Compiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Compiler.cpp b/Compiler.cpp index c5e25a12..da28ba8a 100644 --- a/Compiler.cpp +++ b/Compiler.cpp @@ -32,11 +32,11 @@ using namespace std; namespace dev { namespace solidity { -bytes Compiler::compile(ContractDefinition& _contract) +bytes Compiler::compile(ContractDefinition& _contract, bool _optimize) { Compiler compiler; compiler.compileContract(_contract); - return compiler.m_context.getAssembledBytecode(); + return compiler.m_context.getAssembledBytecode(_optimize); } void Compiler::compileContract(ContractDefinition& _contract) |