diff options
| author | chriseth <chris@ethereum.org> | 2017-12-01 02:12:39 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2017-12-01 02:12:39 +0800 |
| commit | cbb3370836df17dc1edc1497a2caa6fb930cd4dd (patch) | |
| tree | 94eff8356c89be95572738ba641035327f5e1c60 /libjulia | |
| parent | 9f756e37975504936b8f536474d4ea3274d5baeb (diff) | |
| download | dexon-solidity-cbb3370836df17dc1edc1497a2caa6fb930cd4dd.tar dexon-solidity-cbb3370836df17dc1edc1497a2caa6fb930cd4dd.tar.gz dexon-solidity-cbb3370836df17dc1edc1497a2caa6fb930cd4dd.tar.bz2 dexon-solidity-cbb3370836df17dc1edc1497a2caa6fb930cd4dd.tar.lz dexon-solidity-cbb3370836df17dc1edc1497a2caa6fb930cd4dd.tar.xz dexon-solidity-cbb3370836df17dc1edc1497a2caa6fb930cd4dd.tar.zst dexon-solidity-cbb3370836df17dc1edc1497a2caa6fb930cd4dd.zip | |
Fix namespace ambiguity.
Diffstat (limited to 'libjulia')
| -rw-r--r-- | libjulia/backends/evm/EVMAssembly.cpp | 2 | ||||
| -rw-r--r-- | libjulia/backends/evm/EVMCodeTransform.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libjulia/backends/evm/EVMAssembly.cpp b/libjulia/backends/evm/EVMAssembly.cpp index 1d499b20..07ad05c9 100644 --- a/libjulia/backends/evm/EVMAssembly.cpp +++ b/libjulia/backends/evm/EVMAssembly.cpp @@ -26,7 +26,7 @@ using namespace std; using namespace dev; -using namespace julia; +using namespace dev::julia; namespace { diff --git a/libjulia/backends/evm/EVMCodeTransform.cpp b/libjulia/backends/evm/EVMCodeTransform.cpp index 13d9d011..099b83fe 100644 --- a/libjulia/backends/evm/EVMCodeTransform.cpp +++ b/libjulia/backends/evm/EVMCodeTransform.cpp @@ -31,7 +31,8 @@ using namespace std; using namespace dev; using namespace dev::julia; using namespace dev::solidity; -using namespace dev::solidity::assembly; + +using Scope = dev::solidity::assembly::Scope; void CodeTransform::operator()(VariableDeclaration const& _varDecl) { |