aboutsummaryrefslogtreecommitdiffstats
path: root/solc
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-08-27 01:32:18 +0800
committerGitHub <noreply@github.com>2016-08-27 01:32:18 +0800
commitfb7836d87bba0eacb2454d6c50b1209365a89b6d (patch)
tree81810b473d4ae5f76e2cb97a959ff234382966ac /solc
parent69acd25888007c536bef22e350725cf444db58ad (diff)
parent56558c0db2ad1e64aa81aaa05820388c2ba65a45 (diff)
downloaddexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar.gz
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar.bz2
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar.lz
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar.xz
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar.zst
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.zip
Merge pull request #897 from Denton-L/remove-standard
BREAKING: Remove standard contracts
Diffstat (limited to 'solc')
-rw-r--r--solc/CommandLineInterface.cpp2
-rw-r--r--solc/jsonCompiler.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 08c08797..fbef56f0 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -560,7 +560,7 @@ bool CommandLineInterface::processInput()
}
};
- m_compiler.reset(new CompilerStack(m_args.count(g_argAddStandard) > 0, fileReader));
+ m_compiler.reset(new CompilerStack(fileReader));
auto scannerFromSourceName = [&](string const& _sourceName) -> solidity::Scanner const& { return m_compiler->scanner(_sourceName); };
try
{
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index 896a5922..5cdee2e2 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -159,7 +159,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
return result;
};
}
- CompilerStack compiler(true, readCallback);
+ CompilerStack compiler(readCallback);
auto scannerFromSourceName = [&](string const& _sourceName) -> solidity::Scanner const& { return compiler.scanner(_sourceName); };
bool success = false;
try