aboutsummaryrefslogtreecommitdiffstats
path: root/solc/CommandLineInterface.cpp
diff options
context:
space:
mode:
authorRhett Aultman <rhett.aultman@meraki.net>2017-01-06 09:08:34 +0800
committerRhett Aultman <rhett.aultman@meraki.net>2017-01-17 01:32:58 +0800
commit610156fb92cbf9feadf14b6d0827f0f840b4c765 (patch)
tree5dad8b94cc71bd0d46d54dbe1fd2d38517a0d4d6 /solc/CommandLineInterface.cpp
parentfda39afdba9591131aac6d647cb46247e9495606 (diff)
downloaddexon-solidity-610156fb92cbf9feadf14b6d0827f0f840b4c765.tar
dexon-solidity-610156fb92cbf9feadf14b6d0827f0f840b4c765.tar.gz
dexon-solidity-610156fb92cbf9feadf14b6d0827f0f840b4c765.tar.bz2
dexon-solidity-610156fb92cbf9feadf14b6d0827f0f840b4c765.tar.lz
dexon-solidity-610156fb92cbf9feadf14b6d0827f0f840b4c765.tar.xz
dexon-solidity-610156fb92cbf9feadf14b6d0827f0f840b4c765.tar.zst
dexon-solidity-610156fb92cbf9feadf14b6d0827f0f840b4c765.zip
Fix bad merge artifact(?)
Looks like merging up munged line 188 in CommandLineInterface.cpp, so that a string literal was being used where a global variable should be.
Diffstat (limited to 'solc/CommandLineInterface.cpp')
-rw-r--r--solc/CommandLineInterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 4a4d3571..e49e8517 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -185,7 +185,7 @@ void CommandLineInterface::handleBinary(string const& _contract)
{
if (m_args.count(g_argBinary))
{
- if (m_args.count("output-dir"))
+ if (m_args.count(g_argOutputDir))
createFile(m_compiler->filesystemFriendlyName(_contract) + ".bin", m_compiler->object(_contract).toHex());
else
{