diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-11 15:32:51 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 20:42:29 +0300 |
| commit | 6282b28b6fe218390b843a8a71bb5cc2b63dd05c (patch) | |
| tree | 5c45fe4caad2571494d6d237b76c8eced84e0d2b /src/mbgl/renderer/render_pass.hpp | |
| parent | d918f8d7c2e9eb4e3514078da6621c159e67069c (diff) | |
| download | qtlocation-mapboxgl-6282b28b6fe218390b843a8a71bb5cc2b63dd05c.tar.gz | |
[core] Added MBGL_CONSTEXPR to satisfy GCC 4.9
Diffstat (limited to 'src/mbgl/renderer/render_pass.hpp')
| -rw-r--r-- | src/mbgl/renderer/render_pass.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/renderer/render_pass.hpp b/src/mbgl/renderer/render_pass.hpp index d273e34ff7..ae2b923ba1 100644 --- a/src/mbgl/renderer/render_pass.hpp +++ b/src/mbgl/renderer/render_pass.hpp @@ -1,6 +1,7 @@ #pragma once #include <mbgl/util/traits.hpp> +#include <mbgl/util/util.hpp> #include <cstdint> @@ -12,15 +13,15 @@ enum class RenderPass : uint8_t { Translucent = 1 << 1, }; -constexpr RenderPass operator|(RenderPass a, RenderPass b) { +MBGL_CONSTEXPR RenderPass operator|(RenderPass a, RenderPass b) { return RenderPass(mbgl::underlying_type(a) | mbgl::underlying_type(b)); } -constexpr RenderPass& operator|=(RenderPass& a, RenderPass b) { +MBGL_CONSTEXPR RenderPass& operator|=(RenderPass& a, RenderPass b) { return (a = a | b); } -constexpr RenderPass operator&(RenderPass a, RenderPass b) { +MBGL_CONSTEXPR RenderPass operator&(RenderPass a, RenderPass b) { return RenderPass(mbgl::underlying_type(a) & mbgl::underlying_type(b)); } |