cerc-io/solidity
11
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 #9655 from a3d4/fix-msvc-adl

Browse Source 
Fix MSVC ADL
This commit is contained in:
chriseth
2020-09-01 10:35:11 +02:00
committed by GitHub
parent 34543e5eab 8faa5243b5
commit f628fd3f03
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/ExecutionFramework.cpp
+5 -2
View File
@@ -97,12 +97,15 @@ u256 ExecutionFramework::gasLimit() const
u256 ExecutionFramework::gasPrice() const
{
return {EVMHost::convertFromEVMC(m_evmHost->tx_context.tx_gas_price)};
// here and below we use "return u256{....}" instead of just "return {....}"
// to please MSVC and avoid unexpected
// warning C4927 : illegal conversion; more than one user - defined conversion has been implicitly applied
return u256{EVMHost::convertFromEVMC(m_evmHost->tx_context.tx_gas_price)};
}
u256 ExecutionFramework::blockHash(u256 const& _number) const
{
return {EVMHost::convertFromEVMC(
return u256{EVMHost::convertFromEVMC(
m_evmHost->get_block_hash(static_cast<int64_t>(_number & numeric_limits<uint64_t>::max()))
)};
}