diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 14:55:07 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 17:10:45 -0700 |
| commit | a4c82b8a3b5e48f3bbccf32be80d45ca78d51515 (patch) | |
| tree | dc5576c815a49fd310e6c599f87eac64d3f99e7d /src/mbgl/text/shaping.hpp | |
| parent | ee3235708f5422c2737c41fca948c67ace598f4b (diff) | |
| download | qtlocation-mapboxgl-a4c82b8a3b5e48f3bbccf32be80d45ca78d51515.tar.gz | |
[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==.
Diffstat (limited to 'src/mbgl/text/shaping.hpp')
| -rw-r--r-- | src/mbgl/text/shaping.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp index cd5e8105fd..7852f710f1 100644 --- a/src/mbgl/text/shaping.hpp +++ b/src/mbgl/text/shaping.hpp @@ -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&); |