Integrate C++11 branch into 5_1-new
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#include "global.h"
|
||||
#include "LocalizedString.h"
|
||||
#include "Foreach.h"
|
||||
|
||||
#include "RageUtil.h"
|
||||
#include "SubscriptionManager.h"
|
||||
|
||||
@@ -27,9 +27,8 @@ static LocalizedString::MakeLocalizer g_pMakeLocalizedStringImpl = LocalizedStri
|
||||
void LocalizedString::RegisterLocalizer( MakeLocalizer pFunc )
|
||||
{
|
||||
g_pMakeLocalizedStringImpl = pFunc;
|
||||
FOREACHS( LocalizedString*, *m_Subscribers.m_pSubscribers, l )
|
||||
for (LocalizedString *pLoc : *m_Subscribers.m_pSubscribers)
|
||||
{
|
||||
LocalizedString *pLoc = *l;
|
||||
pLoc->CreateImpl();
|
||||
}
|
||||
}
|
||||
@@ -40,7 +39,7 @@ LocalizedString::LocalizedString( const RString& sGroup, const RString& sName )
|
||||
|
||||
m_sGroup = sGroup;
|
||||
m_sName = sName;
|
||||
m_pImpl = NULL;
|
||||
m_pImpl = nullptr;
|
||||
|
||||
CreateImpl();
|
||||
}
|
||||
@@ -51,7 +50,7 @@ LocalizedString::LocalizedString(LocalizedString const& other)
|
||||
|
||||
m_sGroup = other.m_sGroup;
|
||||
m_sName = other.m_sName;
|
||||
m_pImpl = NULL;
|
||||
m_pImpl = nullptr;
|
||||
|
||||
CreateImpl();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user