diff options
| author | chriseth <chris@ethereum.org> | 2017-02-07 19:26:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 19:26:02 +0800 |
| commit | 94e5ab1e43adc3071941130b7652eb3b5f32c9f2 (patch) | |
| tree | f5172d8e58f5a70043ba0e93911fdff7a7f7f8b3 /libsolidity/inlineasm | |
| parent | e5e0eae057816c6ed7f53a3972b7dff3032348ea (diff) | |
| parent | 277415be30588e9694552c43bdbc70cc93aab94a (diff) | |
| download | dexon-solidity-94e5ab1e43adc3071941130b7652eb3b5f32c9f2.tar dexon-solidity-94e5ab1e43adc3071941130b7652eb3b5f32c9f2.tar.gz dexon-solidity-94e5ab1e43adc3071941130b7652eb3b5f32c9f2.tar.bz2 dexon-solidity-94e5ab1e43adc3071941130b7652eb3b5f32c9f2.tar.lz dexon-solidity-94e5ab1e43adc3071941130b7652eb3b5f32c9f2.tar.xz dexon-solidity-94e5ab1e43adc3071941130b7652eb3b5f32c9f2.tar.zst dexon-solidity-94e5ab1e43adc3071941130b7652eb3b5f32c9f2.zip | |
Merge branch 'develop' into docs-version
Diffstat (limited to 'libsolidity/inlineasm')
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index fcc92dbb..46a2730d 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -152,8 +152,8 @@ std::map<string, dev::solidity::Instruction> const& Parser::instructions() s_instructions[name] = instruction.second; } - // add alias for selfdestruct - s_instructions["selfdestruct"] = solidity::Instruction::SUICIDE; + // add alias for suicide + s_instructions["suicide"] = solidity::Instruction::SELFDESTRUCT; } return s_instructions; } |