diff options
| author | chriseth <chris@ethereum.org> | 2018-07-30 22:47:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 22:47:55 +0800 |
| commit | 7cf5cd6050c616599d476a865b1fcfb57472ef22 (patch) | |
| tree | 16d0b81f9ace5fdbc2a9dc21010ca1e89d3b2f6f /liblll/CodeFragment.cpp | |
| parent | 9d09e21b6c7662ad037de3e14dfc8f72f6d0b274 (diff) | |
| parent | c2faed77054c69b8ef35b3e54a2c05acc7e93363 (diff) | |
| download | dexon-solidity-7cf5cd6050c616599d476a865b1fcfb57472ef22.tar dexon-solidity-7cf5cd6050c616599d476a865b1fcfb57472ef22.tar.gz dexon-solidity-7cf5cd6050c616599d476a865b1fcfb57472ef22.tar.bz2 dexon-solidity-7cf5cd6050c616599d476a865b1fcfb57472ef22.tar.lz dexon-solidity-7cf5cd6050c616599d476a865b1fcfb57472ef22.tar.xz dexon-solidity-7cf5cd6050c616599d476a865b1fcfb57472ef22.tar.zst dexon-solidity-7cf5cd6050c616599d476a865b1fcfb57472ef22.zip | |
Merge pull request #4608 from ethereum/lll-namespace
Replace dev::eth namespace with dev::lll in LLL
Diffstat (limited to 'liblll/CodeFragment.cpp')
| -rw-r--r-- | liblll/CodeFragment.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/liblll/CodeFragment.cpp b/liblll/CodeFragment.cpp index 5c68194b..3e82889a 100644 --- a/liblll/CodeFragment.cpp +++ b/liblll/CodeFragment.cpp @@ -32,9 +32,10 @@ #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 +553,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 +620,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) { |