From c81b4989535cde327b95a65c53fd271dc1e52f82 Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Wed, 11 Mar 2015 17:52:18 +0100 Subject: [PATCH] Style fixes in Types[cpp/h] --- Types.cpp | 5 ++--- Types.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Types.cpp b/Types.cpp index aacf56fa3..6f8d4b6b1 100644 --- a/Types.cpp +++ b/Types.cpp @@ -178,8 +178,8 @@ bool IntegerType::isImplicitlyConvertibleTo(Type const& _convertTo) const bool IntegerType::isExplicitlyConvertibleTo(Type const& _convertTo) const { return _convertTo.getCategory() == getCategory() || - _convertTo.getCategory() == Category::Contract || - _convertTo.getCategory() == Category::Enum || + _convertTo.getCategory() == Category::Contract || + _convertTo.getCategory() == Category::Enum || _convertTo.getCategory() == Category::FixedBytes; } @@ -488,7 +488,6 @@ TypePointer FixedBytesType::unaryOperatorResult(Token::Value _operator) const TypePointer FixedBytesType::binaryOperatorResult(Token::Value _operator, TypePointer const& _other) const { auto commonType = dynamic_pointer_cast(Type::commonType(shared_from_this(), _other)); - if (!commonType) return TypePointer(); diff --git a/Types.h b/Types.h index 6517cf070..fd59a37ad 100644 --- a/Types.h +++ b/Types.h @@ -158,7 +158,7 @@ protected: }; /** - * Any kind of integer type including address. + * Any kind of integer type (signed, unsigned, address). */ class IntegerType: public Type { @@ -231,7 +231,7 @@ private: }; /** - * Bytes type with fixed length of up to 32 bytes + * Bytes type with fixed length of up to 32 bytes. */ class FixedBytesType: public Type {