From d83dd59178778b5748092f244ce66e37319f4070 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 28 Nov 2016 00:58:07 +0000 Subject: Move ExecutionFramework to the dev::test namespace --- test/libsolidity/GasMeter.cpp | 1 + test/libsolidity/SolidityEndToEndTest.cpp | 1 + test/libsolidity/SolidityExecutionFramework.cpp | 3 +-- test/libsolidity/SolidityExecutionFramework.h | 4 ++-- test/libsolidity/SolidityOptimizer.cpp | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) (limited to 'test/libsolidity') diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index f467d669..0671fb15 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -32,6 +32,7 @@ using namespace std; using namespace dev::eth; using namespace dev::solidity; +using namespace dev::test; namespace dev { diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index b5fcdb5e..930b11c6 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -31,6 +31,7 @@ using namespace std; using namespace std::placeholders; +using namespace dev::test; namespace dev { diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp index fe35087c..bb9695d1 100644 --- a/test/libsolidity/SolidityExecutionFramework.cpp +++ b/test/libsolidity/SolidityExecutionFramework.cpp @@ -24,8 +24,7 @@ #include #include -using namespace std; -using namespace dev; +using namespace dev::test; using namespace dev::solidity; using namespace dev::solidity::test; diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index 16b886f1..0fab7aeb 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -38,7 +38,7 @@ namespace solidity namespace test { -class SolidityExecutionFramework: public ExecutionFramework +class SolidityExecutionFramework: public dev::test::ExecutionFramework { public: @@ -49,7 +49,7 @@ public: u256 const& _value = 0, std::string const& _contractName = "", bytes const& _arguments = bytes(), - std::map const& _libraryAddresses = std::map() + std::map const& _libraryAddresses = std::map() ) override { // Silence compiler version warning diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp index 15208b41..60310555 100644 --- a/test/libsolidity/SolidityOptimizer.cpp +++ b/test/libsolidity/SolidityOptimizer.cpp @@ -37,6 +37,7 @@ using namespace std; using namespace dev::eth; +using namespace dev::test; namespace dev { -- cgit