New upstream version 2.4.1+dfsg

3 files changed, 7 insertions, 12 deletions

diff --git a/src/SFML/Window/GlContext.cpp b/src/SFML/Window/GlContext.cpp
index 23cf483..8ae4b3a 100644
--- a/src/SFML/Window/GlContext.cpp
+++ b/src/SFML/Window/GlContext.cpp
@@ -231,12 +231,6 @@ void GlContext::globalCleanup()
 
 
 ////////////////////////////////////////////////////////////
-void GlContext::ensureContext()
-{
-}
-
-
-////////////////////////////////////////////////////////////
 void GlContext::acquireTransientContext()
 {
     // If a capable context is already active on this thread
diff --git a/src/SFML/Window/GlContext.hpp b/src/SFML/Window/GlContext.hpp
index abcda4b..55b6c1f 100644
--- a/src/SFML/Window/GlContext.hpp
+++ b/src/SFML/Window/GlContext.hpp
@@ -73,12 +73,6 @@ public:
     static void globalCleanup();
 
     ////////////////////////////////////////////////////////////
-    /// \brief Empty function for ABI compatibility, use acquireTransientContext instead
-    ///
-    ////////////////////////////////////////////////////////////
-    static void ensureContext();
-    
-    ////////////////////////////////////////////////////////////
     /// \brief Acquires a context for short-term use on the current thread
     ///
     ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/GlResource.cpp b/src/SFML/Window/GlResource.cpp
index a3cdddf..e9a9ecc 100644
--- a/src/SFML/Window/GlResource.cpp
+++ b/src/SFML/Window/GlResource.cpp
@@ -73,6 +73,13 @@ GlResource::~GlResource()
 
 
 ////////////////////////////////////////////////////////////
+void GlResource::ensureGlContext()
+{
+    // Empty function for ABI compatibility, use acquireTransientContext instead
+}
+
+
+////////////////////////////////////////////////////////////
 GlResource::TransientContextLock::TransientContextLock() :
 m_context(0)
 {