prefer ptr_container to manual memory management

Signed-off-by: Michael Meeks <michael.meeks@collabora.com>

Conflicts:
	vcl/source/opengl/OpenGLContext.cxx

Change-Id: I11326c2873aad5116fd70bfa31eb94e93fef3f40

2 files changed, 6 insertions, 35 deletions

diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 1ae9ac6e0545..e2d6b777c9ee 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -52,6 +52,7 @@ class NSOpenGLView;
 #include <vcl/vclopengl_dllapi.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <boost/unordered_map.hpp>
+#include <boost/ptr_container/ptr_map.hpp>
 #include <vcl/window.hxx>
 #include <tools/gen.hxx>
 #include <vcl/syschild.hxx>
@@ -161,30 +162,7 @@ struct GLWindow
     ~GLWindow();
 };
 
-struct ProgramKey
-{
-    OUString maVertexShader;
-    OUString maFragmentShader;
-
-    ProgramKey( const OUString& rVertexShader, const OUString& rFragmentShader ):
-        maVertexShader(rVertexShader),
-        maFragmentShader(rFragmentShader)
-    {
-    }
-};
-
-inline bool operator==( ProgramKey const& k1, ProgramKey const& k2 )
-{
-    return k1.maVertexShader == k2.maVertexShader && k1.maFragmentShader == k2.maFragmentShader;
-}
-
-inline std::size_t hash_value( ProgramKey const& rKey )
-{
-    std::size_t nSeed = 0x9e3779b9;
-    nSeed = rKey.maVertexShader.hashCode();
-    nSeed = rKey.maFragmentShader.hashCode() + 0x9e3779b9 + (nSeed << 6) + (nSeed >> 2);
-    return nSeed;
-}
+typedef std::pair<OUString, OUString> ProgramKey;
 
 class VCLOPENGL_DLLPUBLIC OpenGLContext
 {
@@ -289,7 +267,7 @@ private:
     OpenGLFramebuffer* mpFirstFramebuffer;
     OpenGLFramebuffer* mpLastFramebuffer;
 
-    boost::unordered_map<ProgramKey, OpenGLProgram*> maPrograms;
+    boost::ptr_map<ProgramKey, OpenGLProgram> maPrograms;
     OpenGLProgram* mpCurrentProgram;
 #ifdef DBG_UTIL
     std::set<SalGraphicsImpl*> maParents;
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 6c085fb5646e..cfa819109a9b 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1179,15 +1179,8 @@ void OpenGLContext::reset()
     // destroy all programs
     if( !maPrograms.empty() )
     {
-        boost::unordered_map<ProgramKey, OpenGLProgram*>::iterator it;
 
         makeCurrent();
-        it = maPrograms.begin();
-        while( it != maPrograms.end() )
-        {
-            delete it->second;
-            it++;
-        }
         maPrograms.clear();
     }
 
@@ -1545,10 +1538,10 @@ void OpenGLContext::ReleaseFramebuffers()
 
 OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const OUString& rFragmentShader )
 {
-    boost::unordered_map<ProgramKey, OpenGLProgram*>::iterator it;
     ProgramKey aKey( rVertexShader, rFragmentShader );
 
-    it = maPrograms.find( aKey );
+    boost::ptr_map<ProgramKey, OpenGLProgram>::iterator
+        it = maPrograms.find( aKey );
     if( it != maPrograms.end() )
         return it->second;
 
@@ -1559,7 +1552,7 @@ OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const O
         return NULL;
     }
 
-    maPrograms[aKey] = pProgram;
+    maPrograms.insert(aKey, pProgram);
     return pProgram;
 }