diff options
| author | LianaHus <liana@ethdev.com> | 2015-09-10 00:18:34 +0800 |
|---|---|---|
| committer | LianaHus <liana@ethdev.com> | 2015-09-15 17:40:20 +0800 |
| commit | e17938a2a9f1e19a179e1d260d1d7f83668827f5 (patch) | |
| tree | 8ceab9247802659c148359eb755ada3b2614571d /libsolidity/AST.cpp | |
| parent | bc914641318a70dada6cd4c8223f95efeb919771 (diff) | |
| download | dexon-solidity-e17938a2a9f1e19a179e1d260d1d7f83668827f5.tar.gz dexon-solidity-e17938a2a9f1e19a179e1d260d1d7f83668827f5.tar.zst dexon-solidity-e17938a2a9f1e19a179e1d260d1d7f83668827f5.zip | |
fixed conflict mergeing
Diffstat (limited to 'libsolidity/AST.cpp')
| -rw-r--r-- | libsolidity/AST.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp index a77bf0a2..7480ef30 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." )); |