1 files changed, 42 insertions, 42 deletions

diff --git a/include/mbgl/gl/gl_values.hpp b/include/mbgl/gl/gl_values.hpp
index 0d7d294cf7..03ae46a60e 100644
--- a/include/mbgl/gl/gl_values.hpp
+++ b/include/mbgl/gl/gl_values.hpp
@@ -13,10 +13,10 @@ namespace gl {
 struct ClearDepth {
     using Type = GLfloat;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glClearDepth(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type clearDepth;
         MBGL_CHECK_ERROR(glGetFloatv(GL_DEPTH_CLEAR_VALUE, &clearDepth));
         return clearDepth;
@@ -26,10 +26,10 @@ struct ClearDepth {
 struct ClearColor {
     using Type = Color;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glClearColor(value.r, value.g, value.b, value.a));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLfloat floats[4];
         MBGL_CHECK_ERROR(glGetFloatv(GL_COLOR_CLEAR_VALUE, floats));
         return { floats[0], floats[1], floats[2], floats[3] };
@@ -39,10 +39,10 @@ struct ClearColor {
 struct ClearStencil {
     using Type = GLint;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glClearStencil(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type clearStencil;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_STENCIL_CLEAR_VALUE, &clearStencil));
         return clearStencil;
@@ -52,10 +52,10 @@ struct ClearStencil {
 struct StencilMask {
     using Type = GLuint;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glStencilMask(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLint stencilMask;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_STENCIL_WRITEMASK, &stencilMask));
         return stencilMask;
@@ -65,10 +65,10 @@ struct StencilMask {
 struct DepthMask {
     using Type = GLboolean;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glDepthMask(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type depthMask;
         MBGL_CHECK_ERROR(glGetBooleanv(GL_DEPTH_WRITEMASK, &depthMask));
         return depthMask;
@@ -78,10 +78,10 @@ struct DepthMask {
 struct ColorMask {
     struct Type { bool r, g, b, a; };
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glColorMask(value.r, value.g, value.b, value.a));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLboolean bools[4];
         MBGL_CHECK_ERROR(glGetBooleanv(GL_COLOR_WRITEMASK, bools));
         return { static_cast<bool>(bools[0]), static_cast<bool>(bools[1]),
@@ -89,17 +89,17 @@ struct ColorMask {
     }
 };
 
-inline bool operator!=(const ColorMask::Type& a, const ColorMask::Type& b) {
+constexpr bool operator!=(const ColorMask::Type& a, const ColorMask::Type& b) {
     return a.r != b.r || a.g != b.g || a.b != b.b || a.a != b.a;
 }
 
 struct StencilFunc {
     struct Type { GLenum func; GLint ref; GLuint mask; };
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glStencilFunc(value.func, value.ref, value.mask));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLint func, ref, mask;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_STENCIL_FUNC, &func));
         MBGL_CHECK_ERROR(glGetIntegerv(GL_STENCIL_REF, &ref));
@@ -108,17 +108,17 @@ struct StencilFunc {
     }
 };
 
-inline bool operator!=(const StencilFunc::Type& a, const StencilFunc::Type& b) {
+constexpr bool operator!=(const StencilFunc::Type& a, const StencilFunc::Type& b) {
     return a.func != b.func || a.ref != b.ref || a.mask != b.mask;
 }
 
 struct StencilTest {
     using Type = bool;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(value ? glEnable(GL_STENCIL_TEST) : glDisable(GL_STENCIL_TEST));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type stencilTest;
         MBGL_CHECK_ERROR(stencilTest = glIsEnabled(GL_STENCIL_TEST));
         return stencilTest;
@@ -128,10 +128,10 @@ struct StencilTest {
 struct StencilOp {
     struct Type { GLenum sfail, dpfail, dppass; };
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glStencilOp(value.sfail, value.dpfail, value.dppass));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLint sfail, dpfail, dppass;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_STENCIL_FAIL, &sfail));
         MBGL_CHECK_ERROR(glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &dpfail));
@@ -143,27 +143,27 @@ struct StencilOp {
 struct DepthRange {
     struct Type { GLfloat near, far; };
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glDepthRange(value.near, value.far));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLfloat floats[2];
         MBGL_CHECK_ERROR(glGetFloatv(GL_DEPTH_RANGE, floats));
         return { floats[0], floats[1] };
     }
 };
 
-inline bool operator!=(const DepthRange::Type& a, const DepthRange::Type& b) {
+constexpr bool operator!=(const DepthRange::Type& a, const DepthRange::Type& b) {
     return a.near != b.near || a.far != b.far;
 }
 
 struct DepthTest {
     using Type = bool;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(value ? glEnable(GL_DEPTH_TEST) : glDisable(GL_DEPTH_TEST));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type depthTest;
         MBGL_CHECK_ERROR(depthTest = glIsEnabled(GL_DEPTH_TEST));
         return depthTest;
@@ -173,10 +173,10 @@ struct DepthTest {
 struct DepthFunc {
     using Type = GLenum;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glDepthFunc(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLint depthFunc;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_DEPTH_FUNC, &depthFunc));
         return depthFunc;
@@ -186,10 +186,10 @@ struct DepthFunc {
 struct Blend {
     using Type = bool;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(value ? glEnable(GL_BLEND) : glDisable(GL_BLEND));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type blend;
         MBGL_CHECK_ERROR(blend = glIsEnabled(GL_BLEND));
         return blend;
@@ -199,10 +199,10 @@ struct Blend {
 struct BlendFunc {
     struct Type { GLenum sfactor, dfactor; };
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glBlendFunc(value.sfactor, value.dfactor));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLint sfactor, dfactor;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_BLEND_SRC_ALPHA, &sfactor));
         MBGL_CHECK_ERROR(glGetIntegerv(GL_BLEND_DST_ALPHA, &dfactor));
@@ -213,10 +213,10 @@ struct BlendFunc {
 struct Program {
     using Type = GLuint;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glUseProgram(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         GLint program;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_CURRENT_PROGRAM, &program));
         return program;
@@ -226,10 +226,10 @@ struct Program {
 struct LineWidth {
     using Type = GLfloat;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glLineWidth(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type lineWidth;
         MBGL_CHECK_ERROR(glGetFloatv(GL_LINE_WIDTH, &lineWidth));
         return lineWidth;
@@ -239,10 +239,10 @@ struct LineWidth {
 struct ActiveTexture {
     using Type = GLint;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glActiveTexture(value));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type activeTexture;
         MBGL_CHECK_ERROR(glGetIntegerv(GL_ACTIVE_TEXTURE, &activeTexture));
         return activeTexture;
@@ -254,10 +254,10 @@ struct ActiveTexture {
 struct PixelZoom {
     struct Type { GLfloat xfactor; GLfloat yfactor; };
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glPixelZoom(value.xfactor, value.yfactor));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type value;
         MBGL_CHECK_ERROR(glGetFloatv(GL_ZOOM_X, &value.xfactor));
         MBGL_CHECK_ERROR(glGetFloatv(GL_ZOOM_Y, &value.yfactor));
@@ -265,17 +265,17 @@ struct PixelZoom {
     }
 };
 
-inline bool operator!=(const PixelZoom::Type& a, const PixelZoom::Type& b) {
+constexpr bool operator!=(const PixelZoom::Type& a, const PixelZoom::Type& b) {
     return a.xfactor != b.xfactor || a.yfactor != b.yfactor;
 }
 
 struct RasterPos {
     using Type = std::array<GLdouble, 4>;
     static const Type Default;
-    inline static void Set(const Type& value) {
+    static void Set(const Type& value) {
         MBGL_CHECK_ERROR(glRasterPos4d(value[0], value[1], value[2], value[3]));
     }
-    inline static Type Get() {
+    static Type Get() {
         Type pos;
         MBGL_CHECK_ERROR(glGetDoublev(GL_CURRENT_RASTER_POSITION, pos.data()));
         return pos;