actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 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/Preference.cpp
+8 -8
View File
@@ -7,7 +7,7 @@
#include "SubscriptionManager.h"
#include "Foreach.h"
SubscriptionManager<IPreference> & GetSubscribers()
SubscriptionManager<IPreference> & GetPreferenceSubscribers()
{
static SubscriptionManager<IPreference> subscribers;
return subscribers;
@@ -17,17 +17,17 @@ IPreference::IPreference( const RString& sName ):
m_sName( sName ),
m_bIsStatic( false )
{
GetSubscribers().Subscribe( this );
GetPreferenceSubscribers().Subscribe( this );
}
IPreference::~IPreference()
{
GetSubscribers().Unsubscribe( this );
GetPreferenceSubscribers().Unsubscribe( this );
}
IPreference *IPreference::GetPreferenceByName( const RString &sName )
{
FOREACHS( IPreference*, GetSubscribers().m_pSubscribers, p )
FOREACHS( IPreference*, GetPreferenceSubscribers().m_pSubscribers, p )
{
if( !(*p)->GetName().CompareNoCase( sName ) )
return *p;
@@ -38,20 +38,20 @@ IPreference *IPreference::GetPreferenceByName( const RString &sName )
void IPreference::LoadAllDefaults()
{
FOREACHS_CONST( IPreference*, GetSubscribers().m_pSubscribers, p )
FOREACHS_CONST( IPreference*, GetPreferenceSubscribers().m_pSubscribers, p )
(*p)->LoadDefault();
}
void IPreference::ReadAllPrefsFromNode( const XNode* pNode, bool bIsStatic )
{
ASSERT( pNode != NULL );
FOREACHS_CONST( IPreference*, GetSubscribers().m_pSubscribers, p )
FOREACHS_CONST( IPreference*, GetPreferenceSubscribers().m_pSubscribers, p )
(*p)->ReadFrom( pNode, bIsStatic );
}
void IPreference::SavePrefsToNode( XNode* pNode )
{
FOREACHS_CONST( IPreference*, GetSubscribers().m_pSubscribers, p )
FOREACHS_CONST( IPreference*, GetPreferenceSubscribers().m_pSubscribers, p )
(*p)->WriteTo( pNode );
}
@@ -59,7 +59,7 @@ void IPreference::ReadAllDefaultsFromNode( const XNode* pNode )
{
if( pNode == NULL )
return;
FOREACHS_CONST( IPreference*, GetSubscribers().m_pSubscribers, p )
FOREACHS_CONST( IPreference*, GetPreferenceSubscribers().m_pSubscribers, p )
(*p)->ReadDefaultFrom( pNode );
}