actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix duplication symbol issue on Mac.

Browse Source 
This may have affected Linux as well.
This commit is contained in:
Jason Felds
2013-04-21 09:31:45 -04:00
parent c7b8664604
commit 0c4fe367cc
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ActorUtil.cpp
+4 -4
View File
@@ -14,7 +14,7 @@
// Actor registration
map<RString,CreateActorFn> & GetRegistrees()
map<RString,CreateActorFn> & GetActorUtilRegistrees()
{
static map<RString, CreateActorFn> registrees;
return registrees;
@@ -22,13 +22,13 @@ map<RString,CreateActorFn> & GetRegistrees()
static bool IsRegistered( const RString& sClassName )
{
map<RString, CreateActorFn> & registrees = GetRegistrees();
map<RString, CreateActorFn> & registrees = GetActorUtilRegistrees();
return registrees.find( sClassName ) != registrees.end();
}
void ActorUtil::Register( const RString& sClassName, CreateActorFn pfn )
{
map<RString, CreateActorFn> & registrees = GetRegistrees();
map<RString, CreateActorFn> & registrees = GetActorUtilRegistrees();
map<RString,CreateActorFn>::iterator iter = registrees.find( sClassName );
ASSERT_M( iter == registrees.end(), ssprintf("Actor class '%s' already registered.", sClassName.c_str()) );
@@ -123,7 +123,7 @@ Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor )
if( !bHasClass )
bHasClass = pNode->GetAttrValue( "Type", sClass );
map<RString, CreateActorFn> & registrees = GetRegistrees();
map<RString, CreateActorFn> & registrees = GetActorUtilRegistrees();
map<RString,CreateActorFn>::iterator iter = registrees.find( sClass );
if( iter == registrees.end() )