diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-05-07 04:27:24 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-05-07 04:27:24 +0800 |
| commit | f6d58a2d2557f37c2eb04b03061a261f3ff5850c (patch) | |
| tree | b3fa72ee5f2e98103c3590c597b7b404a29eaf70 /libsolidity | |
| parent | 7881b69f62f9225612a3b975e90cf5242b9690d5 (diff) | |
| parent | e66e225827624ccaaf88f4897715e6e5032849e0 (diff) | |
| download | dexon-solidity-f6d58a2d2557f37c2eb04b03061a261f3ff5850c.tar dexon-solidity-f6d58a2d2557f37c2eb04b03061a261f3ff5850c.tar.gz dexon-solidity-f6d58a2d2557f37c2eb04b03061a261f3ff5850c.tar.bz2 dexon-solidity-f6d58a2d2557f37c2eb04b03061a261f3ff5850c.tar.lz dexon-solidity-f6d58a2d2557f37c2eb04b03061a261f3ff5850c.tar.xz dexon-solidity-f6d58a2d2557f37c2eb04b03061a261f3ff5850c.tar.zst dexon-solidity-f6d58a2d2557f37c2eb04b03061a261f3ff5850c.zip | |
Merge branch 'develop' into v8console
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/Assembly.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/SolidityOptimizer.cpp | 6 |
2 files changed, 6 insertions, 6 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; diff --git a/libsolidity/SolidityOptimizer.cpp b/libsolidity/SolidityOptimizer.cpp index ceb9c68d..9cdaa588 100644 --- a/libsolidity/SolidityOptimizer.cpp +++ b/libsolidity/SolidityOptimizer.cpp @@ -26,9 +26,9 @@ #include <boost/test/unit_test.hpp> #include <boost/lexical_cast.hpp> #include <test/libsolidity/solidityExecutionFramework.h> -#include <libevmcore/CommonSubexpressionEliminator.h> -#include <libevmcore/ControlFlowGraph.h> -#include <libevmcore/Assembly.h> +#include <libevmasm/CommonSubexpressionEliminator.h> +#include <libevmasm/ControlFlowGraph.h> +#include <libevmasm/Assembly.h> using namespace std; using namespace dev::eth; |