diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-02-23 19:28:42 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-02-23 19:28:42 +0800 |
| commit | cd9262badfd1cd7425469d0eba94a5109c20960a (patch) | |
| tree | 05cd1f06ecbd25ca6220cb3ef6c4948e25c4c3d1 /SolidityExpressionCompiler.cpp | |
| parent | 154d439cf8530528fc362f99461f9648ce3b5f45 (diff) | |
| parent | 9a764055ac69ceb9e5a16c4c930730255db13236 (diff) | |
| download | dexon-solidity-cd9262badfd1cd7425469d0eba94a5109c20960a.tar dexon-solidity-cd9262badfd1cd7425469d0eba94a5109c20960a.tar.gz dexon-solidity-cd9262badfd1cd7425469d0eba94a5109c20960a.tar.bz2 dexon-solidity-cd9262badfd1cd7425469d0eba94a5109c20960a.tar.lz dexon-solidity-cd9262badfd1cd7425469d0eba94a5109c20960a.tar.xz dexon-solidity-cd9262badfd1cd7425469d0eba94a5109c20960a.tar.zst dexon-solidity-cd9262badfd1cd7425469d0eba94a5109c20960a.zip | |
Merge remote-tracking branch 'upstream/develop' into addTests
Conflicts:
test/CMakeLists.txt
test/ttTransactionTestFiller.json
Diffstat (limited to 'SolidityExpressionCompiler.cpp')
| -rw-r--r-- | SolidityExpressionCompiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SolidityExpressionCompiler.cpp b/SolidityExpressionCompiler.cpp index 3c3ea1ba..9cd13dcf 100644 --- a/SolidityExpressionCompiler.cpp +++ b/SolidityExpressionCompiler.cpp @@ -477,7 +477,7 @@ BOOST_AUTO_TEST_CASE(blockhash) " }\n" "}\n"; bytes code = compileFirstExpression(sourceCode, {}, {}, - {make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::BLOCK))}); + {make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::Block))}); bytes expectation({byte(eth::Instruction::PUSH1), 0x03, byte(eth::Instruction::BLOCKHASH)}); |