diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-10 16:18:54 +0300 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-13 13:45:48 +0300 |
| commit | 796cc3a4d6ce7fd4d857e0985392efccb388dfb1 (patch) | |
| tree | b28965df0c17928d146cb383805ca225348f48c6 /src/mbgl/layout | |
| parent | f9c15f708ecf3d87c756a196bdc5de93b78b8cfc (diff) | |
| download | qtlocation-mapboxgl-796cc3a4d6ce7fd4d857e0985392efccb388dfb1.tar.gz | |
[core] Bitmask operations for enums
Diffstat (limited to 'src/mbgl/layout')
| -rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 3e2ab5f8b3..4a57b527f7 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -4,8 +4,7 @@ #include <mbgl/text/glyph_atlas.hpp> #include <mbgl/text/collision_feature.hpp> #include <mbgl/style/layers/symbol_layer_properties.hpp> -#include <mbgl/util/traits.hpp> -#include <mbgl/util/util.hpp> +#include <mbgl/util/bitmask_operations.hpp> namespace mbgl { @@ -50,18 +49,6 @@ enum class SymbolContent : uint8_t { IconSDF = 1 << 2 }; -MBGL_CONSTEXPR SymbolContent operator|(SymbolContent a, SymbolContent b) { - return SymbolContent(mbgl::underlying_type(a) | mbgl::underlying_type(b)); -} - -MBGL_CONSTEXPR SymbolContent& operator|=(SymbolContent& a, SymbolContent b) { - return (a = a | b); -} - -MBGL_CONSTEXPR SymbolContent operator&(SymbolContent a, SymbolContent b) { - return SymbolContent(mbgl::underlying_type(a) & mbgl::underlying_type(b)); -} - class SymbolInstance { public: SymbolInstance(Anchor& anchor_, |