diff options
Diffstat (limited to 'liblll/CodeFragment.cpp')
| -rw-r--r-- | liblll/CodeFragment.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/liblll/CodeFragment.cpp b/liblll/CodeFragment.cpp index 5c68194b..0aef05a9 100644 --- a/liblll/CodeFragment.cpp +++ b/liblll/CodeFragment.cpp @@ -22,19 +22,26 @@ #include "CodeFragment.h" #include <boost/algorithm/string.hpp> -#pragma warning(push) + +#if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#endif // defined(__GNUC__) + #include <boost/spirit/include/support_utree.hpp> -#pragma warning(pop) + +#if defined(__GNUC__) #pragma GCC diagnostic pop +#endif // defined(__GNUC__) + #include <libdevcore/CommonIO.h> #include <libevmasm/Instruction.h> #include "CompilerState.h" #include "Parser.h" + using namespace std; using namespace dev; -using namespace dev::eth; +using namespace dev::lll; void CodeFragment::finalise(CompilerState const& _cs) { @@ -552,7 +559,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s) int targetDeposit = hasDefault ? code[code.size() - 1].m_asm.deposit() : 0; // The conditions - AssemblyItems jumpTags; + eth::AssemblyItems jumpTags; for (unsigned i = 0; i < code.size() - 1; i += 2) { requireDeposit(i, 1); @@ -619,7 +626,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s) requireMaxSize(3); requireDeposit(1, 1); - auto subPush = m_asm.appendSubroutine(make_shared<Assembly>(code[0].assembly(ns))); + auto subPush = m_asm.appendSubroutine(make_shared<eth::Assembly>(code[0].assembly(ns))); m_asm.append(Instruction::DUP1); if (code.size() == 3) { |