Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
+3
-3
@@ -8,8 +8,8 @@
|
||||
FontManager* FONT = nullptr; // global and accessible from anywhere in our program
|
||||
|
||||
// map from file name to a texture holder
|
||||
typedef pair<RString,RString> FontName;
|
||||
static map<FontName, Font*> g_mapPathToFont;
|
||||
typedef std::pair<RString,RString> FontName;
|
||||
static std::map<FontName, Font*> g_mapPathToFont;
|
||||
|
||||
FontManager::FontManager()
|
||||
{
|
||||
@@ -39,7 +39,7 @@ Font* FontManager::LoadFont( const RString &sFontOrTextureFilePath, RString sCha
|
||||
|
||||
CHECKPOINT_M( ssprintf("FontManager::LoadFont(%s).", sFontOrTextureFilePath.c_str()) );
|
||||
const FontName NewName( sFontOrTextureFilePath, sChars );
|
||||
map<FontName, Font*>::iterator p = g_mapPathToFont.find( NewName );
|
||||
std::map<FontName, Font*>::iterator p = g_mapPathToFont.find( NewName );
|
||||
if( p != g_mapPathToFont.end() )
|
||||
{
|
||||
pFont=p->second;
|
||||
|
||||
Reference in New Issue
Block a user