summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmiao <zmiao.jamie@gmail.com>2019-08-26 16:36:07 +0300
committerzmiao <zmiao.jamie@gmail.com>2019-08-26 16:36:07 +0300
commit546d994970a8e266b95b5910d4ded7c88ebef7a8 (patch)
treea542caaaa7190d3307d569b5288be50deabf53c4
parent61faf2b15bacd22e154eadb115501c6c4579ff65 (diff)
downloadqtlocation-mapboxgl-546d994970a8e266b95b5910d4ded7c88ebef7a8.tar.gz
use MBGL_MBGL_CONSTEXPR
-rw-r--r--src/mbgl/layout/symbol_instance.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp
index 2471ddc40d..7d002d2285 100644
--- a/src/mbgl/layout/symbol_instance.hpp
+++ b/src/mbgl/layout/symbol_instance.hpp
@@ -5,6 +5,7 @@
#include <mbgl/text/collision_feature.hpp>
#include <mbgl/style/layers/symbol_layer_properties.hpp>
#include <mbgl/util/traits.hpp>
+#include <mbgl/util/util.hpp>
namespace mbgl {
@@ -49,15 +50,15 @@ enum class SymbolContent : uint8_t {
IconSDF = 1 << 2
};
-constexpr SymbolContent operator|(SymbolContent a, SymbolContent b) {
+MBGL_CONSTEXPR SymbolContent operator|(SymbolContent a, SymbolContent b) {
return SymbolContent(mbgl::underlying_type(a) | mbgl::underlying_type(b));
}
-constexpr SymbolContent& operator|=(SymbolContent& a, SymbolContent b) {
+MBGL_CONSTEXPR SymbolContent& operator|=(SymbolContent& a, SymbolContent b) {
return (a = a | b);
}
-constexpr SymbolContent operator&(SymbolContent a, SymbolContent b) {
+MBGL_CONSTEXPR SymbolContent operator&(SymbolContent a, SymbolContent b) {
return SymbolContent(mbgl::underlying_type(a) & mbgl::underlying_type(b));
}