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 #1766 from ryepdx/develop-gcc6.3.0-boost1.63.0

Browse Source 
Updates for gcc 6.3.0 and Boost 1.63.0
This commit is contained in:
chriseth 2017-03-10 10:08:55 +01:00 committed by GitHub
commit f1dd79c743
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/analysis/SemVerHandler.h
View File

@ -34,6 +34,9 @@ class SemVerError: dev::Exception
{ {
}; };
#undef major
#undef minor
struct SemVerVersion struct SemVerVersion
{ {
unsigned numbers[3]; unsigned numbers[3];

10
libsolidity/ast/Types.cpp
View File

@ -650,12 +650,12 @@ bool RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const
if (_convertTo.category() == Category::Integer) if (_convertTo.category() == Category::Integer)
{ {
auto targetType = dynamic_cast<IntegerType const*>(&_convertTo); auto targetType = dynamic_cast<IntegerType const*>(&_convertTo);
if (m_value == 0) if (m_value == rational(0))
return true; return true;
if (isFractional()) if (isFractional())
return false; return false;
int forSignBit = (targetType->isSigned() ? 1 : 0); int forSignBit = (targetType->isSigned() ? 1 : 0);
if (m_value > 0) if (m_value > rational(0))
{ {
if (m_value.numerator() <= (u256(-1) >> (256 - targetType->numBits() + forSignBit))) if (m_value.numerator() <= (u256(-1) >> (256 - targetType->numBits() + forSignBit)))
return true; return true;
@ -776,13 +776,13 @@ TypePointer RationalNumberType::binaryOperatorResult(Token::Value _operator, Typ
value = m_value * other.m_value; value = m_value * other.m_value;
break; break;
case Token::Div: case Token::Div:
if (other.m_value == 0) if (other.m_value == rational(0))
return TypePointer(); return TypePointer();
else else
value = m_value / other.m_value; value = m_value / other.m_value;
break; break;
case Token::Mod: case Token::Mod:
if (other.m_value == 0) if (other.m_value == rational(0))
return TypePointer(); return TypePointer();
else if (fractional) else if (fractional)
{ {
@ -887,7 +887,7 @@ u256 RationalNumberType::literalValue(Literal const*) const
solAssert(shiftedValue <= u256(-1), "Integer constant too large."); solAssert(shiftedValue <= u256(-1), "Integer constant too large.");
solAssert(shiftedValue >= -(bigint(1) << 255), "Number constant too small."); solAssert(shiftedValue >= -(bigint(1) << 255), "Number constant too small.");
if (m_value >= 0) if (m_value >= rational(0))
value = u256(shiftedValue); value = u256(shiftedValue);
else else
value = s2u(s256(shiftedValue)); value = s2u(s256(shiftedValue));