[Libreoffice-commits] core.git: vcl/source

[Thorsten Behrens]

 vcl/source/opengl/OpenGLContext.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 751c5f5b75ed27359d8bd8410e5a19ee638b175c
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Aug 31 15:49:17 2015 +0200

    Revert "werror: fix build in vcl"
    
    This reverts commit 5191fcb11688ef8f4ec312293e57e151762c6952.
    Earlier, better fix was 831c69f9397ed813364235dddf465996d361d0a8

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 70a6cbc5..8253241 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -785,13 +785,9 @@ bool OpenGLContext::ImplInit()
             glXSwapInterval( 1 );
 
             if( errorTriggered )
-            {
                 SAL_WARN("vcl.opengl", "error when trying to set swap interval, NVIDIA or Mesa bug?");
-            }
             else
-            {
                 VCL_GL_INFO("vcl.opengl", "set swap interval to 1 (enable vsync)");
-            }
         }
     }
 
@@ -1363,7 +1359,6 @@ void OpenGLContext::makeCurrent()
 
     // move the context to the end of the contexts list
     static int nSwitch = 0;
-    (void) nSwitch; // -Werror=unused-variable
     VCL_GL_INFO("vcl.opengl", "******* CONTEXT SWITCH " << ++nSwitch << " *********");
     if( mpNextContext )
     {