From 73a4e775c083eff185089c0547443e54253f869d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 24 Sep 2010 14:40:56 +0000 Subject: [PATCH] From Jean-Sebastien Guay, "Changeset 10833 renames discardAllDeletedGLObjects() to discardAllGLObjects() in src/osg/GLObjects.cpp, but the declaration of the function in include/osg/GLObjects remained. So an app using an old version of OSG that called this function would now fail with a linker error instead of a compile error as it should. Removed the declaration. Also fixed a small typo in the following doxygen comment." --- include/osg/GLObjects | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/include/osg/GLObjects b/include/osg/GLObjects index a7570ed33..2c3a52277 100644 --- a/include/osg/GLObjects +++ b/include/osg/GLObjects @@ -30,15 +30,8 @@ extern OSG_EXPORT void flushAllDeletedGLObjects(unsigned int contextID); * Note, must be called from a thread which has current the graphics context associated with contextID. */ extern OSG_EXPORT void deleteAllGLObjects(unsigned int contextID); -/** Discard all deleted OpenGL objects. - * Note, unlike flushAllDeletedObjectObjects discard does not - * do any OpenGL calls so can be called from any thread, but as a consequence it - * also doesn't remove the associated OpenGL resource so discard should only be - * called when the associated graphics context is being/has been closed. */ -extern OSG_EXPORT void discardAllDeletedGLObjects(unsigned int contextID); - /** Discard all OpenGL objects. - * Note, unlike deletedAllObjectObjects discard does not + * Note, unlike deleteAllObjectObjects discard does not * do any OpenGL calls so can be called from any thread, but as a consequence it * also doesn't remove the associated OpenGL resource so discard should only be * called when the associated graphics context is being/has been closed. */