From 4d6c5b2d3b982c7836ea3bf32d5ee8d0c4c699f8 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 3 Jan 2017 15:06:33 -0800 Subject: [core] Remove constexpr from Color GCC can't cope with it. --- include/mbgl/util/color.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'include/mbgl/util/color.hpp') diff --git a/include/mbgl/util/color.hpp b/include/mbgl/util/color.hpp index 178d0dc758..18e4747069 100644 --- a/include/mbgl/util/color.hpp +++ b/include/mbgl/util/color.hpp @@ -10,8 +10,8 @@ namespace mbgl { // Stores a premultiplied color, with all four channels ranging from 0..1 class Color { public: - constexpr Color() = default; - constexpr Color(float r_, float g_, float b_, float a_) + Color() = default; + Color(float r_, float g_, float b_, float a_) : r(r_), g(g_), b(b_), a(a_) { assert(r_ >= 0.0f); assert(r_ <= 1.0f); @@ -28,25 +28,25 @@ public: float b = 0.0f; float a = 0.0f; - static constexpr Color black() { return { 0.0f, 0.0f, 0.0f, 1.0f }; }; - static constexpr Color white() { return { 1.0f, 1.0f, 1.0f, 1.0f }; }; + static Color black() { return { 0.0f, 0.0f, 0.0f, 1.0f }; }; + static Color white() { return { 1.0f, 1.0f, 1.0f, 1.0f }; }; - static constexpr Color red() { return { 1.0f, 0.0f, 0.0f, 1.0f }; }; - static constexpr Color green() { return { 0.0f, 1.0f, 0.0f, 1.0f }; }; - static constexpr Color blue() { return { 0.0f, 0.0f, 1.0f, 1.0f }; }; + static Color red() { return { 1.0f, 0.0f, 0.0f, 1.0f }; }; + static Color green() { return { 0.0f, 1.0f, 0.0f, 1.0f }; }; + static Color blue() { return { 0.0f, 0.0f, 1.0f, 1.0f }; }; static optional parse(const std::string&); }; -constexpr bool operator==(const Color& colorA, const Color& colorB) { +inline bool operator==(const Color& colorA, const Color& colorB) { return colorA.r == colorB.r && colorA.g == colorB.g && colorA.b == colorB.b && colorA.a == colorB.a; } -constexpr bool operator!=(const Color& colorA, const Color& colorB) { +inline bool operator!=(const Color& colorA, const Color& colorB) { return !(colorA == colorB); } -constexpr Color operator*(const Color& color, float alpha) { +inline Color operator*(const Color& color, float alpha) { assert(alpha >= 0.0f); assert(alpha <= 1.0f); return { -- cgit v1.2.1