diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-05-07 04:42:25 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-05-07 04:42:25 +0800 |
| commit | 242547d2e9049b9f713e505de4691a820a45a92b (patch) | |
| tree | c1d48f66cb7f1570a4a4fb9f35a6e2b0d720d6d0 /libsolidity/Assembly.cpp | |
| parent | 2469f0c8bf11c09c7b5402eb3afdb4a3ce9cd5c1 (diff) | |
| parent | fce1a7f82e48ddf3d73e00a2998f003d77f3d5f9 (diff) | |
| download | dexon-solidity-242547d2e9049b9f713e505de4691a820a45a92b.tar dexon-solidity-242547d2e9049b9f713e505de4691a820a45a92b.tar.gz dexon-solidity-242547d2e9049b9f713e505de4691a820a45a92b.tar.bz2 dexon-solidity-242547d2e9049b9f713e505de4691a820a45a92b.tar.lz dexon-solidity-242547d2e9049b9f713e505de4691a820a45a92b.tar.xz dexon-solidity-242547d2e9049b9f713e505de4691a820a45a92b.tar.zst dexon-solidity-242547d2e9049b9f713e505de4691a820a45a92b.zip | |
Merge branch 'develop' into discovery
Diffstat (limited to 'libsolidity/Assembly.cpp')
| -rw-r--r-- | libsolidity/Assembly.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/Assembly.cpp b/libsolidity/Assembly.cpp index 8dcee7fb..ccc4bf81 100644 --- a/libsolidity/Assembly.cpp +++ b/libsolidity/Assembly.cpp @@ -17,20 +17,20 @@ /** * @author Lefteris Karapetsas <lefteris@ethdev.com> * @date 2015 - * Unit tests for Assembly Items from evmcore/Assembly.h + * Unit tests for Assembly Items from evmasm/Assembly.h */ #include <string> #include <iostream> #include <boost/test/unit_test.hpp> #include <libdevcore/Log.h> -#include <libevmcore/SourceLocation.h> +#include <libevmasm/SourceLocation.h> +#include <libevmasm/Assembly.h> #include <libsolidity/Scanner.h> #include <libsolidity/Parser.h> #include <libsolidity/NameAndTypeResolver.h> #include <libsolidity/Compiler.h> #include <libsolidity/AST.h> -#include <libevmcore/Assembly.h> using namespace std; using namespace dev::eth; |