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 #8107 from ethereum/maybe_unused

Browse Source 
Replace void cast by maybe_unused
This commit is contained in:
chriseth 2020-01-09 14:25:08 +01:00 committed by GitHub
commit 00699c444e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/ast/Types.h
View File

@ -211,7 +211,7 @@ public:
/// Always returns a value greater than zero and throws if the type cannot be encoded in calldata /// Always returns a value greater than zero and throws if the type cannot be encoded in calldata
/// (or is dynamically encoded). /// (or is dynamically encoded).
/// If @a _padded then it is assumed that each element is padded to a multiple of 32 bytes. /// If @a _padded then it is assumed that each element is padded to a multiple of 32 bytes.
virtual unsigned calldataEncodedSize(bool _padded) const { (void)_padded; solAssert(false, ""); } virtual unsigned calldataEncodedSize([[maybe_unused]] bool _padded) const { solAssert(false, ""); }
/// Convenience version of @see calldataEncodedSize(bool) /// Convenience version of @see calldataEncodedSize(bool)
unsigned calldataEncodedSize() const { return calldataEncodedSize(true); } unsigned calldataEncodedSize() const { return calldataEncodedSize(true); }
/// @returns the distance between two elements of this type in a calldata array, tuple or struct. /// @returns the distance between two elements of this type in a calldata array, tuple or struct.
@ -1432,7 +1432,7 @@ public:
BoolResult isImplicitlyConvertibleTo(Type const&) const override { return false; } BoolResult isImplicitlyConvertibleTo(Type const&) const override { return false; }
BoolResult isExplicitlyConvertibleTo(Type const&) const override { return false; } BoolResult isExplicitlyConvertibleTo(Type const&) const override { return false; }
TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; } TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
unsigned calldataEncodedSize(bool _padded) const override { (void)_padded; return 32; } unsigned calldataEncodedSize(bool) const override { return 32; }
bool canBeStored() const override { return false; } bool canBeStored() const override { return false; }
bool canLiveOutsideStorage() const override { return false; } bool canLiveOutsideStorage() const override { return false; }
bool isValueType() const override { return true; } bool isValueType() const override { return true; }

3
libsolidity/formal/SMTPortfolio.cpp
View File

@ -34,7 +34,7 @@ using namespace solidity::frontend::smt;
SMTPortfolio::SMTPortfolio( SMTPortfolio::SMTPortfolio(
map<h256, string> const& _smtlib2Responses, map<h256, string> const& _smtlib2Responses,
ReadCallback::Callback const& _smtCallback, ReadCallback::Callback const& _smtCallback,
SMTSolverChoice _enabledSolvers [[maybe_unused]] SMTSolverChoice _enabledSolvers
) )
{ {
m_solvers.emplace_back(make_unique<smt::SMTLib2Interface>(_smtlib2Responses, _smtCallback)); m_solvers.emplace_back(make_unique<smt::SMTLib2Interface>(_smtlib2Responses, _smtCallback));
@ -46,7 +46,6 @@ SMTPortfolio::SMTPortfolio(
if (_enabledSolvers.cvc4) if (_enabledSolvers.cvc4)
m_solvers.emplace_back(make_unique<smt::CVC4Interface>()); m_solvers.emplace_back(make_unique<smt::CVC4Interface>());
#endif #endif
(void)_enabledSolvers;
} }
void SMTPortfolio::reset() void SMTPortfolio::reset()

3
libyul/AsmParser.cpp
View File

@ -554,8 +554,7 @@ bool Parser::isValidNumberLiteral(string const& _literal)
try try
{ {
// Try to convert _literal to u256. // Try to convert _literal to u256.
auto tmp = u256(_literal); [[maybe_unused]] auto tmp = u256(_literal);
(void) tmp;
} }
catch (...) catch (...)
{ {