Revert memory leak commits

5f7001e: "Added a new branch"
01456ed: "Fixed a lot of memory leaks"
dac4493: "Fixed all remaining memory leaks that I could figure out"
0792db7: "Removed the smnew macro and the call to _CrtSetDbgFlag()"

Some of these caused destructor-time problems due to static initialization
order fiasco and related issues.  Notably, the program would no longer exit on
OSX and had to be killed.

There were probably legitimate fixes in here, but since these are monolithic
commits it's too much work to extract them now.  Let's reapply them
individually and in the forward direction.
This commit is contained in:
Devin J. Pohly
2013-04-27 00:05:14 -04:00
parent ef9c5294a0
commit feb919f0bf
33 changed files with 182 additions and 266 deletions
+13 -12
View File
@@ -63,12 +63,7 @@ LoadedThemeData *g_pLoadedThemeData = NULL;
// For self-registering metrics
#include "SubscriptionManager.h"
SubscriptionManager<IThemeMetric> & GetMetricSubscribers()
{
static SubscriptionManager<IThemeMetric> subscribers;
return subscribers;
}
static SubscriptionManager<IThemeMetric> g_Subscribers;
class LocalizedStringImplThemeMetric : public ILocalizedStringImpl, public ThemeMetric<RString>
{
@@ -100,7 +95,7 @@ public:
void ThemeManager::Subscribe( IThemeMetric *p )
{
GetMetricSubscribers().Subscribe( p );
g_Subscribers.Subscribe( p );
// It's ThemeManager's responsibility to make sure all of its subscribers
// are updated with current data. If a metric is created after
@@ -112,7 +107,7 @@ void ThemeManager::Subscribe( IThemeMetric *p )
void ThemeManager::Unsubscribe( IThemeMetric *p )
{
GetMetricSubscribers().Unsubscribe( p );
g_Subscribers.Unsubscribe( p );
}
@@ -434,14 +429,20 @@ void ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RSt
void ThemeManager::ReloadSubscribers()
{
// reload subscribers
FOREACHS_CONST( IThemeMetric*, GetMetricSubscribers().m_pSubscribers, p )
(*p)->Read();
if( g_Subscribers.m_pSubscribers )
{
FOREACHS_CONST( IThemeMetric*, *g_Subscribers.m_pSubscribers, p )
(*p)->Read();
}
}
void ThemeManager::ClearSubscribers()
{
FOREACHS_CONST( IThemeMetric*, GetMetricSubscribers().m_pSubscribers, p )
(*p)->Clear();
if( g_Subscribers.m_pSubscribers )
{
FOREACHS_CONST( IThemeMetric*, *g_Subscribers.m_pSubscribers, p )
(*p)->Clear();
}
}
void ThemeManager::RunLuaScripts( const RString &sMask, bool bUseThemeDir )