aboutsummaryrefslogtreecommitdiffstats
path: root/CommandLineInterface.cpp
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-04-24 18:51:11 +0800
committerchriseth <c@ethdev.com>2015-04-24 18:51:11 +0800
commitbb788bcbc34a6ae98f438087b85cb291e2fcab2e (patch)
treeb8bc97f74a78c0d3666a426f5d7546a7ad7ee6fb /CommandLineInterface.cpp
parentd8f7051685c7a335bac68af628d33b4147b030be (diff)
parent87e8c8151436ec45236309710d47b97ae8248d49 (diff)
downloaddexon-solidity-bb788bcbc34a6ae98f438087b85cb291e2fcab2e.tar
dexon-solidity-bb788bcbc34a6ae98f438087b85cb291e2fcab2e.tar.gz
dexon-solidity-bb788bcbc34a6ae98f438087b85cb291e2fcab2e.tar.bz2
dexon-solidity-bb788bcbc34a6ae98f438087b85cb291e2fcab2e.tar.lz
dexon-solidity-bb788bcbc34a6ae98f438087b85cb291e2fcab2e.tar.xz
dexon-solidity-bb788bcbc34a6ae98f438087b85cb291e2fcab2e.tar.zst
dexon-solidity-bb788bcbc34a6ae98f438087b85cb291e2fcab2e.zip
Merge pull request #1737 from chriseth/sol_fix_solcWithoutJson
Do not handle combined JSON if option not given.
Diffstat (limited to 'CommandLineInterface.cpp')
-rw-r--r--CommandLineInterface.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/CommandLineInterface.cpp b/CommandLineInterface.cpp
index 0cc1ab25..d5ff7b29 100644
--- a/CommandLineInterface.cpp
+++ b/CommandLineInterface.cpp
@@ -380,6 +380,9 @@ bool CommandLineInterface::processInput()
void CommandLineInterface::handleCombinedJSON()
{
+ if (!m_args.count("combined-json"))
+ return;
+
Json::Value output(Json::objectValue);
set<string> requests;