aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/Assembly.cpp
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-05-07 04:27:24 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-05-07 04:27:24 +0800
commitf6d58a2d2557f37c2eb04b03061a261f3ff5850c (patch)
treeb3fa72ee5f2e98103c3590c597b7b404a29eaf70 /libsolidity/Assembly.cpp
parent7881b69f62f9225612a3b975e90cf5242b9690d5 (diff)
parente66e225827624ccaaf88f4897715e6e5032849e0 (diff)
downloaddexon-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/Assembly.cpp')
-rw-r--r--libsolidity/Assembly.cpp6
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;