From ba423579255848440318d6c468a604914901779b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 2 Mar 2017 18:24:40 +0100 Subject: Remove uses of SAL_CONSTEXPR in LIBO_INTERNAL_ONLY Change-Id: I9a7dc7c83302b3361f056fcf6636bbba7672f15f Reviewed-on: https://gerrit.libreoffice.org/34840 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- vcl/opengl/LineRenderUtils.cxx | 2 +- vcl/opengl/texture.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/opengl') diff --git a/vcl/opengl/LineRenderUtils.cxx b/vcl/opengl/LineRenderUtils.cxx index c815b8a014d2..bdf28b1120d1 100644 --- a/vcl/opengl/LineRenderUtils.cxx +++ b/vcl/opengl/LineRenderUtils.cxx @@ -151,7 +151,7 @@ void LineBuilder::appendRoundJoint(glm::vec2 const & point, glm::vec2 prevLineVe void LineBuilder::appendRoundLineCapVertices(const glm::vec2& rPoint1, const glm::vec2& rPoint2) { - SAL_CONSTEXPR const int nRoundCapIteration = 12; + constexpr int nRoundCapIteration = 12; glm::vec2 lineVector = vcl::vertex::normalize(rPoint2 - rPoint1); glm::vec2 normal = glm::vec2(-lineVector.y, lineVector.x); diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx index aff717dd8eb8..002d03f8bea0 100644 --- a/vcl/opengl/texture.cxx +++ b/vcl/opengl/texture.cxx @@ -34,7 +34,7 @@ namespace { -SAL_CONSTEXPR GLenum constInternalFormat = GL_RGBA8; +constexpr GLenum constInternalFormat = GL_RGBA8; } // end anonymous namespace -- cgit