Memory leak fixes from Till Busch

[simgear.git] / simgear / scene / material / matlib.hxx

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 14a0a8d10bd04364729ca4cc0b33a7bd3e1d62fe..1407e44f5b3680a6745564b9cdc39435c0ea3dec 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -53,7 +53,7 @@ class SGMaterialLib {
 private:
 
     // associative array of materials
-    typedef map < string, SGSharedPtr<SGMaterial>, less<string> > material_map;
+    typedef map < string, SGSharedPtr<SGMaterial> > material_map;
     typedef material_map::iterator material_map_iterator;
     typedef material_map::const_iterator const_material_map_iterator;
 
@@ -75,18 +75,13 @@ public:
     // find a material record by material name
     SGMaterial *find( const string& material );
 
-    /**
-     * Load the next deferred texture, if there is any.
-     */
-    void load_next_deferred();
-
     material_map_iterator begin() { return matlib.begin(); }
     const_material_map_iterator begin() const { return matlib.begin(); }
 
     material_map_iterator end() { return matlib.end(); }
     const_material_map_iterator end() const { return matlib.end(); }
 
-    const SGMaterial* findMaterial(const osg::Node* leaf) const;
+    const SGMaterial* findMaterial(const osg::StateSet* stateSet) const;
 
     // Destructor
     ~SGMaterialLib ( void );