gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

fix: CLogger's ELogMethod is now inside the class and does not use names that are vulnerable to macro destruction (fixes a conflict with Windows system header's #define ERROR)

Browse Source 
This was SVN commit r5532.
This commit is contained in:
janwas
2007-12-29 16:22:23 +00:00
parent 5768b9b8ab
commit 5529977ecd
67 changed files with 212 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/FormationCollection.cpp
+2 -2
View File
@@ -50,12 +50,12 @@ CFormation* CFormationCollection::GetTemplate( const CStrW& name )
CFormation* newTemplate = new CFormation();
if( !newTemplate->LoadXml( path ) )
{
LOG(ERROR, LOG_CATEGORY, "CFormationCollection::LoadTemplates(): Couldn't load template \"%s\"", path.c_str());
LOG(CLogger::Error, LOG_CATEGORY, "CFormationCollection::LoadTemplates(): Couldn't load template \"%s\"", path.c_str());
delete newTemplate;
return( NULL );
}
LOG(NORMAL, LOG_CATEGORY, "CFormationCollection::LoadTemplates(): Loaded template \"%s\"", path.c_str());
LOG(CLogger::Normal, LOG_CATEGORY, "CFormationCollection::LoadTemplates(): Loaded template \"%s\"", path.c_str());
m_templates[name] = newTemplate;
return newTemplate;