diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-14 22:36:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 22:36:47 +0800 |
| commit | 0a04a35a2e02437ae038af41c947b3e829946bca (patch) | |
| tree | 345679632d47ede35d47a799146e76e43afe7297 /libsolidity/analysis | |
| parent | 4d9790b6d5a490d30ed55b69fa117bc568fa4c64 (diff) | |
| parent | a26a5f20ce46800f8deff5724b5c101bb9b5fc1d (diff) | |
| download | dexon-solidity-0a04a35a2e02437ae038af41c947b3e829946bca.tar dexon-solidity-0a04a35a2e02437ae038af41c947b3e829946bca.tar.gz dexon-solidity-0a04a35a2e02437ae038af41c947b3e829946bca.tar.bz2 dexon-solidity-0a04a35a2e02437ae038af41c947b3e829946bca.tar.lz dexon-solidity-0a04a35a2e02437ae038af41c947b3e829946bca.tar.xz dexon-solidity-0a04a35a2e02437ae038af41c947b3e829946bca.tar.zst dexon-solidity-0a04a35a2e02437ae038af41c947b3e829946bca.zip | |
Merge pull request #2722 from ethereum/statemutability
Introduce state mutability (to replace const/payable)
Diffstat (limited to 'libsolidity/analysis')
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 8dd45a90..dbc95c4f 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -500,8 +500,6 @@ bool TypeChecker::visit(FunctionDefinition const& _function) m_errorReporter.typeError(_function.location(), "Library functions cannot be payable."); if (!_function.isConstructor() && !_function.isFallback() && !_function.isPartOfExternalInterface()) m_errorReporter.typeError(_function.location(), "Internal functions cannot be payable."); - if (_function.isDeclaredConst()) - m_errorReporter.typeError(_function.location(), "Functions cannot be constant and payable at the same time."); } for (ASTPointer<VariableDeclaration> const& var: _function.parameters() + _function.returnParameters()) { |