From 41497e9c4174d310f3a62548f3cfeb9da2852849 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 17 Jun 2016 12:18:39 +0300 Subject: [core] Cleaned up enum classes - Replaced static_cast with C++ casts. - Replaced inline with constexpr. --- src/mbgl/renderer/render_pass.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mbgl/renderer/render_pass.hpp') 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(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(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 -- cgit v1.2.1