Merge pull request #6407 from ethereum/changeNamespace

Remove "using namespace" from header and move Instruction to dev::eth.
This commit is contained in:
chriseth
2019-03-28 14:32:07 +01:00
committed by GitHub
66 changed files with 190 additions and 220 deletions
-1
View File
@@ -40,7 +40,6 @@
using namespace std;
using namespace langutil;
using namespace yul;
using namespace dev::solidity;
namespace
{
-1
View File
@@ -37,7 +37,6 @@ using namespace std;
using namespace dev;
using namespace yul;
using namespace yul::test;
using namespace dev::solidity;
namespace
{
+1 -1
View File
@@ -85,7 +85,7 @@ bool ObjectCompilerTest::run(ostream& _stream, string const& _linePrefix, bool c
"Bytecode: " +
toHex(obj.bytecode->bytecode) +
"\nOpcodes: " +
boost::trim_copy(solidity::disassemble(obj.bytecode->bytecode)) +
boost::trim_copy(dev::eth::disassemble(obj.bytecode->bytecode)) +
"\n";
if (m_expectation != m_obtainedResult)
+1 -1
View File
@@ -36,7 +36,7 @@ string assemble(string const& _input)
{
AssemblyStack asmStack;
BOOST_REQUIRE_MESSAGE(asmStack.parseAndAnalyze("", _input), "Source did not parse: " + _input);
return dev::solidity::disassemble(asmStack.assemble(AssemblyStack::Machine::EVM, true).bytecode->bytecode);
return dev::eth::disassemble(asmStack.assemble(AssemblyStack::Machine::EVM, true).bytecode->bytecode);
}
}