cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ethereum/develop' into sol_import

Browse Source 
Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/CompilerStack.h
	libsolidity/InterfaceHandler.cpp
	libsolidity/InterfaceHandler.h
	solc/main.cpp
	test/solidityJSONInterfaceTest.cpp
	test/solidityNatspecJSON.cpp
This commit is contained in:
Christian
2014-12-08 12:07:17 +01:00
parent d25d98a260 407f11ba76
commit 26f554d0d8
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CompilerStack.cpp
+4 -4
View File
@@ -131,7 +131,7 @@ string const& CompilerStack::getInterface(std::string const& _contractName)
return getJsonDocumentation(_contractName, ABI_INTERFACE);
}
std::string const& CompilerStack::getJsonDocumentation(std::string const& _contractName, enum DocumentationType _type)
std::string const& CompilerStack::getJsonDocumentation(std::string const& _contractName, DocumentationType _type)
{
if (!m_parseSuccessful)
BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful."));
@@ -141,13 +141,13 @@ std::string const& CompilerStack::getJsonDocumentation(std::string const& _contr
std::unique_ptr<string>* doc;
switch (_type)
{
case NATSPEC_USER:
case DocumentationType::NATSPEC_USER:
doc = &contract.userDocumentation;
break;
case NATSPEC_DEV:
case DocumentationType::NATSPEC_DEV:
doc = &contract.devDocumentation;
break;
case ABI_INTERFACE:
case DocumentationType::ABI_INTERFACE:
doc = &contract.interface;
break;
default: