From e17938a2a9f1e19a179e1d260d1d7f83668827f5 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 9 Sep 2015 18:18:34 +0200 Subject: [PATCH] fixed conflict mergeing --- libsolidity/AST.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp index a77bf0a2c..7480ef305 100644 --- a/libsolidity/AST.cpp +++ b/libsolidity/AST.cpp @@ -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." ));