Reduce compiler.h to almost nothing (but it's worth keeping around I think, for

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

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 52f414e054a11f544631b65f89bc219bf43899f6..9c96523b2460d03abcd2d518f3b1775edddd0c33 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -33,7 +33,7 @@
 
 #include <simgear/structure/SGSharedPtr.hxx>
 
-#include STL_STRING            // Standard C++ string library
+#include <string>              // Standard C++ string library
 #include <map>                 // STL associative "array"
 #include <vector>              // STL "array"
 
@@ -41,6 +41,7 @@
 #include <osg/StateSet>
 
 class SGMaterial;
+class SGPropertyNode;
 
 SG_USING_STD(string);
 SG_USING_STD(map);
@@ -53,7 +54,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;
 
@@ -65,7 +66,8 @@ public:
     SGMaterialLib ( void );
 
     // Load a library of material properties
-    bool load( const string &fg_root, const string& mpath, const char *season );
+    bool load( const string &fg_root, const string& mpath, const char *season,
+            SGPropertyNode *prop_root );
 
     // Add the named texture with default properties
     bool add_item( const string &tex_path );
@@ -75,11 +77,6 @@ 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(); }