diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-03 15:06:33 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-04 12:10:27 -0800 |
| commit | 4d6c5b2d3b982c7836ea3bf32d5ee8d0c4c699f8 (patch) | |
| tree | 36d6f6b5ecfc7cb6979df04c4c2a1bfa6ee081bb /src/mbgl/gl | |
| parent | b38710541941797c2937ea262e9905abccf56287 (diff) | |
| download | qtlocation-mapboxgl-4d6c5b2d3b982c7836ea3bf32d5ee8d0c4c699f8.tar.gz | |
[core] Remove constexpr from Color
GCC can't cope with it.
Diffstat (limited to 'src/mbgl/gl')
| -rw-r--r-- | src/mbgl/gl/value.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/gl/value.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/gl/value.cpp b/src/mbgl/gl/value.cpp index 86218f3d9a..603d82dfd5 100644 --- a/src/mbgl/gl/value.cpp +++ b/src/mbgl/gl/value.cpp @@ -22,7 +22,7 @@ ClearDepth::Type ClearDepth::Get() { return clearDepth; } -const constexpr ClearColor::Type ClearColor::Default; +const ClearColor::Type ClearColor::Default { 0, 0, 0, 0 }; void ClearColor::Set(const Type& value) { MBGL_CHECK_ERROR(glClearColor(value.r, value.g, value.b, value.a)); @@ -205,7 +205,7 @@ BlendFunc::Type BlendFunc::Get() { static_cast<ColorMode::BlendFactor>(dfactor) }; } -const constexpr BlendColor::Type BlendColor::Default; +const BlendColor::Type BlendColor::Default { 0, 0, 0, 0 }; void BlendColor::Set(const Type& value) { MBGL_CHECK_ERROR(glBlendColor(value.r, value.g, value.b, value.a)); diff --git a/src/mbgl/gl/value.hpp b/src/mbgl/gl/value.hpp index 3586c26bda..eccd3e7373 100644 --- a/src/mbgl/gl/value.hpp +++ b/src/mbgl/gl/value.hpp @@ -21,7 +21,7 @@ struct ClearDepth { struct ClearColor { using Type = Color; - static const constexpr Type Default = { 0, 0, 0, 0 }; + static const Type Default; static void Set(const Type&); static Type Get(); }; @@ -142,7 +142,7 @@ constexpr bool operator!=(const BlendFunc::Type& a, const BlendFunc::Type& b) { struct BlendColor { using Type = Color; - static const constexpr Type Default = { 0, 0, 0, 0 }; + static const Type Default; static void Set(const Type&); static Type Get(); }; |