[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl

[Michael Meeks]

 include/vcl/opengl/OpenGLHelper.hxx |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 3583320ac924be7082917620222468d4cff5d29c
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Aug 28 20:05:44 2015 +0100

    Avoid bogus warnings with VCL_GL_INFO, by making the optimizer work.
    
    Change-Id: Ia4afcd58b4ce0b4d6d9708a4cede0857b7633b9e
    Reviewed-on: https://gerrit.libreoffice.org/18171
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index f2fb214..646a2d3 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -24,16 +24,15 @@
 #endif
 
 /// Helper to do a SAL_INFO as well as a GL log.
-#if OSL_DEBUG_LEVEL > 0
-#  define VCL_GL_INFO(area,stream)          \
-    do {                                    \
-        ::std::ostringstream detail_stream; \
-        detail_stream << stream;            \
-        OpenGLHelper::debugMsgStream((area),detail_stream); \
-    } while (0)
-#else
-#  define VCL_GL_INFO(area,stream)
-#endif
+#define VCL_GL_INFO(area,stream) \
+    do { \
+        if (SAL_DETAIL_ENABLE_LOG_INFO) \
+        { \
+            ::std::ostringstream detail_stream; \
+            detail_stream << stream;            \
+            OpenGLHelper::debugMsgStream((area),detail_stream); \
+        } \
+    } while (false)
 
 class VCL_DLLPUBLIC OpenGLHelper
 {