diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-08-28 20:05:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-31 10:56:39 +0000 |
| commit | 3583320ac924be7082917620222468d4cff5d29c (patch) | |
| tree | 4ec42d8e33dc0456c240df1e37f6f4d4ea27d47a | |
| parent | 11fc36a480e4b775fc1b3fbe70b816a860379f9a (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/vcl/opengl/OpenGLHelper.hxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index f2fb2141af37..646a2d39254e 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 { |