diff options
| author | chriseth <chris@ethereum.org> | 2017-11-30 23:08:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-30 23:08:09 +0800 |
| commit | c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40 (patch) | |
| tree | 27c068f6cd96513a9023e586c209eb9f01309171 /libsolidity/inlineasm/AsmDataForward.h | |
| parent | 9cf6e910bd2b90d0c9415d9c257f85fe0c518de8 (diff) | |
| parent | d0af0c14841648365ad05ecc626e672a16df5b5c (diff) | |
| download | dexon-solidity-c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40.tar dexon-solidity-c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40.tar.gz dexon-solidity-c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40.tar.bz2 dexon-solidity-c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40.tar.lz dexon-solidity-c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40.tar.xz dexon-solidity-c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40.tar.zst dexon-solidity-c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40.zip | |
Merge pull request #3261 from ethereum/develop
Merge develop into release for 0.4.19
Diffstat (limited to 'libsolidity/inlineasm/AsmDataForward.h')
| -rw-r--r-- | libsolidity/inlineasm/AsmDataForward.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libsolidity/inlineasm/AsmDataForward.h b/libsolidity/inlineasm/AsmDataForward.h index 4ead7ff5..d627b41a 100644 --- a/libsolidity/inlineasm/AsmDataForward.h +++ b/libsolidity/inlineasm/AsmDataForward.h @@ -41,11 +41,12 @@ struct VariableDeclaration; struct FunctionalInstruction; struct FunctionDefinition; struct FunctionCall; +struct If; struct Switch; struct ForLoop; struct Block; -using Statement = boost::variant<Instruction, Literal, Label, StackAssignment, Identifier, Assignment, FunctionCall, FunctionalInstruction, VariableDeclaration, FunctionDefinition, Switch, ForLoop, Block>; +using Statement = boost::variant<Instruction, Literal, Label, StackAssignment, Identifier, Assignment, FunctionCall, FunctionalInstruction, VariableDeclaration, FunctionDefinition, If, Switch, ForLoop, Block>; } } |