Replaced some debugging structure David inadvertantly removed.

[flightgear.git] / src / Objects / matlib.cxx

diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx
index 9c0ec1e593eca1209451a23c3eede2de1eb8675d..272c23fc3fb75a185699286cdcf3ecfd052318cd 100644 (file)
--- a/src/Objects/matlib.cxx
+++ b/src/Objects/matlib.cxx
@@ -71,7 +71,7 @@ bool FGMaterialLib::load( const string& mpath ) {
 
   SGPropertyNode materials;
 
-  cout << "Reading materials from " << mpath << endl;
+  SG_LOG(SG_INPUT, SG_INFO, "Reading materials from " << mpath);
   try {
     readProperties(mpath, &materials);
   } catch (const sg_exception &ex) {
@@ -86,7 +86,7 @@ bool FGMaterialLib::load( const string& mpath ) {
       FGNewMat * m = new FGNewMat(node);
 
       vector<const SGPropertyNode *>names = node->getChildren("name");
-      for (int j = 0; j < names.size(); j++) {
+      for (unsigned int j = 0; j < names.size(); j++) {
        m->ref();
        matlib[names[j]->getStringValue()] = m;
        SG_LOG( SG_TERRAIN, SG_INFO, "  Loading material "
@@ -211,9 +211,12 @@ int FGMaterialLib::get_step ()
 void FGMaterialLib::load_next_deferred() {
     // container::iterator it = begin();
     for ( material_map_iterator it = begin(); it != end(); it++ ) {
-       const string &key = it->first;
+       /* we don't need the key, but here's how we'd get it if we wanted it. */
+        // const string &key = it->first;
        FGNewMat *slot = it->second;
        if (slot->load_texture())
          return;
     }
 }
+
+