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

Julien Nabet serval2412 at yahoo.fr
Mon Nov 17 01:28:05 PST 2014


 vcl/source/opengl/OpenGLContext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 277a59c0e8f3fefc78a2bde659443dd81c368299
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Nov 15 18:39:08 2014 +0100

    cppcheck: Return value of std::remove() ignored. Elements remain in container.
    
    Change-Id: I1e3bcb013d27c6f9a1484c9f1e23b63f42615b9b
    Reviewed-on: https://gerrit.libreoffice.org/12460
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 0659ce5..98eb068 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -65,7 +65,7 @@ OpenGLContext::~OpenGLContext()
 #elif defined( UNX )
     if(m_aGLWin.ctx)
     {
-        std::remove( vShareList.begin(), vShareList.end(), m_aGLWin.ctx );
+        vShareList.erase(std::remove( vShareList.begin(), vShareList.end(), m_aGLWin.ctx ));
 
         glXMakeCurrent(m_aGLWin.dpy, None, NULL);
         if( glGetError() != GL_NO_ERROR )


More information about the Libreoffice-commits mailing list