[core] operator bool() must always be explicit

Otherwise, it can participate in unexpected conversions. Case in point: GlyphSet::insert was comparing the result of GlyphMetrics::operator bool() where it wanted to use operator==.
This commit is contained in:
John Firebaugh
2016-10-28 14:55:07 -07:00
parent ee3235708f
commit a4c82b8a3b
3 changed files with 13 additions and 5 deletions

View File

@@ -13,7 +13,7 @@ public:
constexpr Size(const uint32_t width_, const uint32_t height_) : width(width_), height(height_) {
}
constexpr operator bool() const {
constexpr explicit operator bool() const {
return width > 0 && height > 0;
}

View File

@@ -14,7 +14,7 @@ namespace mbgl {
GlyphRange getGlyphRange(char32_t glyph);
struct GlyphMetrics {
operator bool() const {
explicit operator bool() const {
return !(width == 0 && height == 0 && advance == 0);
}
@@ -27,12 +27,20 @@ struct GlyphMetrics {
};
inline bool operator==(const GlyphMetrics& lhs, const GlyphMetrics& rhs) {
return lhs.width == rhs.width &&
lhs.height == rhs.height &&
lhs.left == rhs.left &&
lhs.top == rhs.top &&
lhs.advance == rhs.advance;
}
struct Glyph {
explicit Glyph() : rect(0, 0, 0, 0), metrics() {}
explicit Glyph(Rect<uint16_t> rect_, GlyphMetrics metrics_)
: rect(std::move(rect_)), metrics(std::move(metrics_)) {}
operator bool() const {
explicit operator bool() const {
return metrics || rect.hasArea();
}
@@ -64,7 +72,7 @@ class Shaping {
int32_t left;
int32_t right;
operator bool() const { return !positionedGlyphs.empty(); }
explicit operator bool() const { return !positionedGlyphs.empty(); }
};
class SDFGlyph {

View File

@@ -26,7 +26,7 @@ class PositionedIcon {
float left = 0;
float right = 0;
operator bool() const { return image && (*image).pos.hasArea(); }
explicit operator bool() const { return image && (*image).pos.hasArea(); }
};
PositionedIcon shapeIcon(const SpriteAtlasElement& image, const style::SymbolLayoutProperties&);