Removed the smnew macro and the call to _CrtSetDbgFlag() to get ready for

merging with the main branch.
This commit is contained in:
Shenjoku
2013-04-19 20:34:11 -07:00
parent dac4493fe5
commit 0792db752a
195 changed files with 585 additions and 598 deletions
+3 -3
View File
@@ -73,7 +73,7 @@ SubscriptionManager<IThemeMetric> & GetSubscribers()
class LocalizedStringImplThemeMetric : public ILocalizedStringImpl, public ThemeMetric<RString>
{
public:
static ILocalizedStringImpl *Create() { return smnew LocalizedStringImplThemeMetric; }
static ILocalizedStringImpl *Create() { return new LocalizedStringImplThemeMetric; }
void Load( const RString& sGroup, const RString& sName )
{
@@ -280,7 +280,7 @@ bool ThemeManager::DoesLanguageExist( const RString &sLanguage )
void ThemeManager::LoadThemeMetrics( const RString &sThemeName_, const RString &sLanguage_ )
{
if( g_pLoadedThemeData == NULL )
g_pLoadedThemeData = smnew LoadedThemeData;
g_pLoadedThemeData = new LoadedThemeData;
// Don't delete and recreate LoadedThemeData. There are references iniMetrics and iniStrings
// on the stack, so Clear them instead.
@@ -1051,7 +1051,7 @@ void ThemeManager::GetMetric( const RString &sMetricsGroup, const RString &sValu
#if !defined(SMPACKAGE)
apActorCommands ThemeManager::GetMetricA( const RString &sMetricsGroup, const RString &sValueName )
{
LuaReference *pRef = smnew LuaReference;
LuaReference *pRef = new LuaReference;
GetMetric( sMetricsGroup, sValueName, *pRef );
return apActorCommands( pRef );
}