Merge branch 'develop' into build_enhancement

This commit is contained in:
Marek Kotewicz 2014-12-11 15:07:32 +01:00
commit 0f26b24794

View File

@ -184,7 +184,7 @@ private:
class BoolType: public Type class BoolType: public Type
{ {
public: public:
explicit BoolType() {} BoolType() {}
virtual Category getCategory() const { return Category::BOOL; } virtual Category getCategory() const { return Category::BOOL; }
virtual bool isExplicitlyConvertibleTo(Type const& _convertTo) const override; virtual bool isExplicitlyConvertibleTo(Type const& _convertTo) const override;
virtual bool acceptsBinaryOperator(Token::Value _operator) const override virtual bool acceptsBinaryOperator(Token::Value _operator) const override