From 832d514d059a8248d8864f0bd317be2fcb5b59df Mon Sep 17 00:00:00 2001 From: david Date: Sat, 7 Sep 2002 13:16:48 +0000 Subject: [PATCH] Added explicit std:: prefix to map to work-around MSVC6 bug reported by Jonathan Polley. --- src/Model/loader.cxx | 8 ++++---- src/Model/loader.hxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Model/loader.cxx b/src/Model/loader.cxx index 0e0ccf4d7..5fcd8360e 100644 --- a/src/Model/loader.cxx +++ b/src/Model/loader.cxx @@ -23,7 +23,7 @@ FGSSGLoader::FGSSGLoader () FGSSGLoader::~FGSSGLoader () { - map::iterator it = _table.begin(); + std::map::iterator it = _table.begin(); while (it != _table.end()) { it->second->deRef(); _table.erase(it); @@ -33,7 +33,7 @@ FGSSGLoader::~FGSSGLoader () void FGSSGLoader::flush () { - map::iterator it = _table.begin(); + std::map::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::iterator it = _table.find(path); + std::map::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::iterator it = _table.find(path); + std::map::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 bbacbecf7..956e6bdcd 100644 --- a/src/Model/loader.hxx +++ b/src/Model/loader.hxx @@ -26,7 +26,7 @@ public: virtual ~FGSSGLoader (); virtual void flush (); protected: - map _table; + std::map _table; }; -- 2.39.5