cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9178 from ethereum/fixBreaking

Browse Source 
Fix compiler error.
This commit is contained in:
chriseth 2020-06-10 18:54:30 +02:00 committed by GitHub
commit 06bd9e23d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/analysis/TypeChecker.cpp
View File

@ -334,8 +334,8 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
m_errorReporter.warning(5815_error, _function.location(), "Interface functions are implicitly \"virtual\""); m_errorReporter.warning(5815_error, _function.location(), "Interface functions are implicitly \"virtual\"");
if (_function.visibility() == Visibility::Private) if (_function.visibility() == Visibility::Private)
m_errorReporter.typeError(3942_error, _function.location(), "\"virtual\" and \"private\" cannot be used together."); m_errorReporter.typeError(3942_error, _function.location(), "\"virtual\" and \"private\" cannot be used together.");
if (isLibraryFunction) if (_function.libraryFunction())
m_errorReporter.typeError(1878_error, _function.location(), "Library functions cannot be \"virtual\"."); m_errorReporter.typeError(7801_error, _function.location(), "Library functions cannot be \"virtual\".");
} }
if (_function.isPayable()) if (_function.isPayable())

2
libyul/AsmAnalysis.cpp
View File

@ -592,7 +592,7 @@ bool AsmAnalyzer::warnOnInstructions(evmasm::Instruction _instr, SourceLocation
else if (_instr == evmasm::Instruction::PC) else if (_instr == evmasm::Instruction::PC)
{ {
m_errorReporter.error( m_errorReporter.error(
4316_error, 2450_error,
Error::Type::SyntaxError, Error::Type::SyntaxError,
_location, _location,
"PC instruction is a low-level EVM feature. " "PC instruction is a low-level EVM feature. "