diff options
| author | Paweł Bylica <chfast@gmail.com> | 2015-06-24 23:28:56 +0800 |
|---|---|---|
| committer | Paweł Bylica <chfast@gmail.com> | 2015-06-24 23:28:56 +0800 |
| commit | 79e7325e3fcf4eccd40a44a3615259ff80873f3c (patch) | |
| tree | 34a9e41503d9bbb9e93c9ae2a763cf19afa9799c /libsolidity/Assembly.cpp | |
| parent | 3d3734d95bf0cd819e8945ce850ce6a2d477dd63 (diff) | |
| parent | f15b7905d2b2366d0882e5aa0c7c61eaee39b095 (diff) | |
| download | dexon-solidity-79e7325e3fcf4eccd40a44a3615259ff80873f3c.tar dexon-solidity-79e7325e3fcf4eccd40a44a3615259ff80873f3c.tar.gz dexon-solidity-79e7325e3fcf4eccd40a44a3615259ff80873f3c.tar.bz2 dexon-solidity-79e7325e3fcf4eccd40a44a3615259ff80873f3c.tar.lz dexon-solidity-79e7325e3fcf4eccd40a44a3615259ff80873f3c.tar.xz dexon-solidity-79e7325e3fcf4eccd40a44a3615259ff80873f3c.tar.zst dexon-solidity-79e7325e3fcf4eccd40a44a3615259ff80873f3c.zip | |
Merge remote-tracking branch 'upstream/develop' into evmjit-develop
Conflicts:
evmjit/CMakeLists.txt
evmjit/libevmjit/Arith256.cpp
Diffstat (limited to 'libsolidity/Assembly.cpp')
| -rw-r--r-- | libsolidity/Assembly.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libsolidity/Assembly.cpp b/libsolidity/Assembly.cpp index fd4bbcf6..8d316a97 100644 --- a/libsolidity/Assembly.cpp +++ b/libsolidity/Assembly.cpp @@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(location_test) AssemblyItems items = compileContract(sourceCode); vector<SourceLocation> locations = vector<SourceLocation>(17, SourceLocation(2, 75, n)) + - vector<SourceLocation>(14, SourceLocation(20, 72, n)) + + vector<SourceLocation>(26, SourceLocation(20, 72, n)) + vector<SourceLocation>{SourceLocation(42, 51, n), SourceLocation(65, 67, n)} + vector<SourceLocation>(4, SourceLocation(58, 67, n)) + vector<SourceLocation>(3, SourceLocation(20, 72, n)); |