diff options
| author | chriseth <chris@ethereum.org> | 2018-12-20 01:06:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 01:06:13 +0800 |
| commit | 1df8f40cd2fd7b47698d847907b8ca7b47eb488d (patch) | |
| tree | 5ed5816fe2d1a8a207e750d39884aca7957c8289 /solc | |
| parent | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (diff) | |
| parent | ddf54b21d1d002903624f61173ab4af197f50053 (diff) | |
| download | dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.gz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.bz2 dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.lz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.xz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.zst dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.zip | |
Merge pull request #5697 from ethereum/develop
Merge develop into release for 0.5.2
Diffstat (limited to 'solc')
| -rw-r--r-- | solc/CommandLineInterface.cpp | 6 | ||||
| -rw-r--r-- | solc/CommandLineInterface.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 38e778c6..bda1b78a 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -858,8 +858,7 @@ bool CommandLineInterface::processInput() m_compiler.reset(new CompilerStack(fileReader)); - auto scannerFromSourceName = [&](string const& _sourceName) -> Scanner const& { return m_compiler->scanner(_sourceName); }; - SourceReferenceFormatter formatter(serr(false), scannerFromSourceName); + SourceReferenceFormatter formatter(serr(false)); try { @@ -1222,8 +1221,7 @@ bool CommandLineInterface::assemble( for (auto const& sourceAndStack: assemblyStacks) { auto const& stack = sourceAndStack.second; - auto scannerFromSourceName = [&](string const&) -> Scanner const& { return stack.scanner(); }; - SourceReferenceFormatter formatter(serr(false), scannerFromSourceName); + SourceReferenceFormatter formatter(serr(false)); for (auto const& error: stack.errors()) { diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h index 0b22ca29..ff294adc 100644 --- a/solc/CommandLineInterface.h +++ b/solc/CommandLineInterface.h @@ -41,8 +41,6 @@ enum class DocumentationType: uint8_t; class CommandLineInterface { public: - CommandLineInterface() {} - /// Parse command line arguments and return false if we should not continue bool parseArguments(int _argc, char** _argv); /// Parse the files and create source code objects |