summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-17 12:18:39 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-18 20:23:00 +0300
commit41497e9c4174d310f3a62548f3cfeb9da2852849 (patch)
treeae3e0fc54f10cba24f61bf22c440d45c87c9441a /src
parent0006c9c27542da2f262e7bc105999f3072e4b6f2 (diff)
downloadqtlocation-mapboxgl-41497e9c4174d310f3a62548f3cfeb9da2852849.tar.gz
[core] Cleaned up enum classes
- Replaced static_cast with C++ casts. - Replaced inline with constexpr.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/renderer/render_pass.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/render_pass.hpp b/src/mbgl/renderer/render_pass.hpp
index e31383b7cf..93edac2039 100644
--- a/src/mbgl/renderer/render_pass.hpp
+++ b/src/mbgl/renderer/render_pass.hpp
@@ -12,16 +12,16 @@ enum class RenderPass : uint8_t {
Translucent = 1 << 1,
};
-constexpr inline RenderPass operator|(RenderPass a, RenderPass b) {
- return static_cast<RenderPass>(mbgl::underlying_type(a) | mbgl::underlying_type(b));
+constexpr RenderPass operator|(RenderPass a, RenderPass b) {
+ return RenderPass(mbgl::underlying_type(a) | mbgl::underlying_type(b));
}
-inline RenderPass operator|=(RenderPass& a, RenderPass b) {
+constexpr RenderPass& operator|=(RenderPass& a, RenderPass b) {
return (a = a | b);
}
-constexpr inline RenderPass operator&(RenderPass a, RenderPass b) {
- return static_cast<RenderPass>(mbgl::underlying_type(a) & mbgl::underlying_type(b));
+constexpr RenderPass operator&(RenderPass a, RenderPass b) {
+ return RenderPass(mbgl::underlying_type(a) & mbgl::underlying_type(b));
}
} // namespace mbgl