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

fixed conflict mergeing

Browse Source
This commit is contained in:
LianaHus
2015-09-15 11:40:20 +02:00
parent bc91464131
commit e17938a2a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/AST.cpp
+2 -2
View File
@@ -59,8 +59,8 @@ void ContractDefinition::checkTypeRequirements()
checkAbstractConstructors();
FunctionDefinition const* functionDefinition = constructor();
if (functionDefinition && !functionDefinition->getReturnParameters().empty())
BOOST_THROW_EXCEPTION(functionDefinition->getReturnParameterList()->createTypeError(
if (functionDefinition && !functionDefinition->returnParameters().empty())
BOOST_THROW_EXCEPTION(functionDefinition->returnParameterList()->createTypeError(
"Non-empty \"returns\" directive for constructor."
));