diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-05-07 17:44:23 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-05-07 17:44:23 +0800 |
| commit | 612ee398b7dae5f387f94fe169de4301929d5ac4 (patch) | |
| tree | f5f22f1068cc2de0386c087d90593ad263c84992 /libsolidity/Assembly.cpp | |
| parent | 75982d444f52e864e56daf6054c2f13835b3a961 (diff) | |
| parent | e66e225827624ccaaf88f4897715e6e5032849e0 (diff) | |
| download | dexon-solidity-612ee398b7dae5f387f94fe169de4301929d5ac4.tar dexon-solidity-612ee398b7dae5f387f94fe169de4301929d5ac4.tar.gz dexon-solidity-612ee398b7dae5f387f94fe169de4301929d5ac4.tar.bz2 dexon-solidity-612ee398b7dae5f387f94fe169de4301929d5ac4.tar.lz dexon-solidity-612ee398b7dae5f387f94fe169de4301929d5ac4.tar.xz dexon-solidity-612ee398b7dae5f387f94fe169de4301929d5ac4.tar.zst dexon-solidity-612ee398b7dae5f387f94fe169de4301929d5ac4.zip | |
Merge remote-tracking branch 'upstream/develop' into walletTests
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; |