Added explicit std:: prefix to map to work-around MSVC6 bug reported

by Jonathan Polley.

diff --git a/src/Model/loader.cxx b/src/Model/loader.cxx
index 0e0ccf4d7ca50e046a9ac99bddb2ab877c7e64d7..5fcd8360e5d605c91105259f29aecff02e73d008 100644 (file)
--- a/src/Model/loader.cxx
+++ b/src/Model/loader.cxx
@@ -23,7 +23,7 @@ FGSSGLoader::FGSSGLoader ()
 
 FGSSGLoader::~FGSSGLoader ()
 {
-    map<string, ssgBase *>::iterator it = _table.begin();
+    std::map<string, ssgBase *>::iterator it = _table.begin();
     while (it != _table.end()) {
         it->second->deRef();
         _table.erase(it);
@@ -33,7 +33,7 @@ FGSSGLoader::~FGSSGLoader ()
 void
 FGSSGLoader::flush ()
 {
-    map<string, ssgBase *>::iterator it = _table.begin();
+    std::map<string, ssgBase *>::iterator it = _table.begin();
     while (it != _table.end()) {
         ssgBase * item = it->second;
                                 // If there is only one reference, it's
@@ -65,7 +65,7 @@ FGModelLoader::load_model (const string &path)
 {
                                 // FIXME: normalize path to
                                 // avoid duplicates.
-    map<string, ssgBase *>::iterator it = _table.find(path);
+    std::map<string, ssgBase *>::iterator it = _table.find(path);
     if (it == _table.end()) {
         _table[path] = fgLoad3DModel((char *)path.c_str());
         it = _table.find(path);
@@ -91,7 +91,7 @@ FGTextureLoader::~FGTextureLoader ()
 ssgTexture *
 FGTextureLoader::load_texture (const string &path)
 {
-    map<string, ssgBase *>::iterator it = _table.find(path);
+    std::map<string, ssgBase *>::iterator it = _table.find(path);
     if (it == _table.end()) {
         _table[path] = new ssgTexture((char *)path.c_str()); // FIXME wrapu/v
         it = _table.find(path);

diff --git a/src/Model/loader.hxx b/src/Model/loader.hxx
index bbacbecf7a124c89f7ada9c6a102f556c85e649a..956e6bdcd4a18d55d277cc87cca2c2a745c3e51d 100644 (file)
--- a/src/Model/loader.hxx
+++ b/src/Model/loader.hxx
@@ -26,7 +26,7 @@ public:
     virtual ~FGSSGLoader ();
     virtual void flush ();
 protected:
-    map<string,ssgBase *> _table;
+    std::map<string,ssgBase *> _table;
 };