include/vcl/opengl/OpenGLHelper.hxx | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 831c69f9397ed813364235dddf465996d361d0a8
Author: Michael Meeks <michael.me...@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
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index f2fb214..fd9c2de 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); \
+#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 (0)
-#else
-# define VCL_GL_INFO(area,stream)
-#endif
class VCL_DLLPUBLIC OpenGLHelper
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
