fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source 
by Jonathan Polley.
This commit is contained in:
david 2002-09-07 13:16:48 +00:00
parent f0195b564d
commit 832d514d05
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/loader.cxx
View file

@ -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);

2
src/Model/loader.hxx
View file

@ -26,7 +26,7 @@ public:
virtual ~FGSSGLoader ();
virtual void flush ();
protected:
map<string,ssgBase *> _table;
std::map<string,ssgBase *> _table;
};