From cbb3370836df17dc1edc1497a2caa6fb930cd4dd Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 30 Nov 2017 19:12:39 +0100
Subject: Fix namespace ambiguity.

---
 libjulia/backends/evm/EVMAssembly.cpp      | 2 +-
 libjulia/backends/evm/EVMCodeTransform.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'libjulia/backends/evm')

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)
 {
-- 
cgit v1.2.3