mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
fixed conflict mergeing
This commit is contained in:
parent
bc91464131
commit
e17938a2a9
@ -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."
|
||||
));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user