diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-02 18:24:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 06:47:35 +0000 |
| commit | ba423579255848440318d6c468a604914901779b (patch) | |
| tree | 7c4bc01a2c7210bca3e8a19a012b15312f37b588 /vcl | |
| parent | afa675469cd9894f41a6b9eeb2e7acc8245d256c (diff) | |
Remove uses of SAL_CONSTEXPR in LIBO_INTERNAL_ONLY
Change-Id: I9a7dc7c83302b3361f056fcf6636bbba7672f15f
Reviewed-on: https://gerrit.libreoffice.org/34840
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/opengl/LineRenderUtils.cxx | 2 | ||||
| -rw-r--r-- | vcl/opengl/texture.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 |