Fix duplication symbol issue on Mac.

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
+4 -4
View File
@@ -4,7 +4,7 @@
#include "RageUtil.h"
#include "SubscriptionManager.h"
SubscriptionManager<LocalizedString> & GetSubscribers()
SubscriptionManager<LocalizedString> & GetLocalizedSubscribers()
{
static SubscriptionManager<LocalizedString> subscribers;
return subscribers;
@@ -31,7 +31,7 @@ static LocalizedString::MakeLocalizer g_pMakeLocalizedStringImpl = LocalizedStri
void LocalizedString::RegisterLocalizer( MakeLocalizer pFunc )
{
g_pMakeLocalizedStringImpl = pFunc;
FOREACHS( LocalizedString*, GetSubscribers().m_pSubscribers, l )
FOREACHS( LocalizedString*, GetLocalizedSubscribers().m_pSubscribers, l )
{
LocalizedString *pLoc = *l;
pLoc->CreateImpl();
@@ -40,7 +40,7 @@ void LocalizedString::RegisterLocalizer( MakeLocalizer pFunc )
LocalizedString::LocalizedString( const RString& sGroup, const RString& sName )
{
GetSubscribers().Subscribe( this );
GetLocalizedSubscribers().Subscribe( this );
m_sGroup = sGroup;
m_sName = sName;
@@ -51,7 +51,7 @@ LocalizedString::LocalizedString( const RString& sGroup, const RString& sName )
LocalizedString::~LocalizedString()
{
GetSubscribers().Unsubscribe( this );
GetLocalizedSubscribers().Unsubscribe( this );
SAFE_DELETE( m_pImpl );
}