fixed conflict mergeing

This commit is contained in:
LianaHus 2015-09-09 18:18:34 +02:00
parent bc91464131
commit e17938a2a9

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."
));