FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it compile with gcc-3.3.6

Browse Source
This commit is contained in:
frohlich
2006-06-17 16:04:05 +00:00
parent b3262fcb80
commit f79906bf16
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
simgear/scene/material/mat.cxx
View File

@@ -317,6 +317,15 @@ void SGMaterial::assignTexture( ssgSimpleState *state, string &fname,
}
}
SGMaterialGlyph* SGMaterial::get_glyph (const string& name) const
{
map<string, SGSharedPtr<SGMaterialGlyph> >::const_iterator it;
it = glyphs.find(name);
if (it == glyphs.end())
return 0;
return it->second;
}
////////////////////////////////////////////////////////////////////////

5
simgear/scene/material/mat.hxx
View File

@@ -207,10 +207,7 @@ public:
/**
* Return pointer to glyph class, or 0 if it doesn't exist.
*/
SGMaterialGlyph * get_glyph (const string& name) const {
map<string, SGSharedPtr<SGMaterialGlyph> >::const_iterator it = glyphs.find(name);
return it != glyphs.end() ? it->second : 0;
}
SGMaterialGlyph * get_glyph (const string& name) const;
protected: