diff options
| author | Dimitry <winsvega@mail.ru> | 2016-04-02 20:56:43 +0800 |
|---|---|---|
| committer | Dimitry <winsvega@mail.ru> | 2016-04-02 20:56:43 +0800 |
| commit | 858c41260d4cec26ba38ea3bd2ef71dcede63f7c (patch) | |
| tree | 8dd03312a5f926f8dd95a4a7f0798c2b6624c1e3 /solc | |
| parent | ccbd3ff63feb696025c18211c3c93bab47f755b0 (diff) | |
| download | dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.gz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.bz2 dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.lz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.xz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.zst dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.zip | |
rename namespace for instruction.h/cpp in libevmasm
Diffstat (limited to 'solc')
| -rw-r--r-- | solc/CommandLineInterface.cpp | 6 | ||||
| -rw-r--r-- | solc/jsonCompiler.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 0583ea4f..d82a2442 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -161,11 +161,11 @@ void CommandLineInterface::handleBinary(string const& _contract) void CommandLineInterface::handleOpcode(string const& _contract) { if (m_args.count("output-dir")) - createFile(_contract + ".opcode", eth::disassemble(m_compiler->object(_contract).bytecode)); + createFile(_contract + ".opcode", solidity::disassemble(m_compiler->object(_contract).bytecode)); else { cout << "Opcodes: " << endl; - cout << eth::disassemble(m_compiler->object(_contract).bytecode); + cout << solidity::disassemble(m_compiler->object(_contract).bytecode); cout << endl; } } @@ -674,7 +674,7 @@ void CommandLineInterface::handleCombinedJSON() if (requests.count("clone-bin")) contractData["clone-bin"] = m_compiler->cloneObject(contractName).toHex(); if (requests.count("opcodes")) - contractData["opcodes"] = eth::disassemble(m_compiler->object(contractName).bytecode); + contractData["opcodes"] = solidity::disassemble(m_compiler->object(contractName).bytecode); if (requests.count("asm")) { ostringstream unused; diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index bf7ebe5c..1c20d695 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -206,7 +206,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback contractData["interface"] = compiler.interface(contractName); contractData["bytecode"] = compiler.object(contractName).toHex(); contractData["runtimeBytecode"] = compiler.runtimeObject(contractName).toHex(); - contractData["opcodes"] = eth::disassemble(compiler.object(contractName).bytecode); + contractData["opcodes"] = solidity::disassemble(compiler.object(contractName).bytecode); contractData["functionHashes"] = functionHashes(compiler.contractDefinition(contractName)); contractData["gasEstimates"] = estimateGas(compiler, contractName); ostringstream unused; |