aboutsummaryrefslogtreecommitdiff
path: root/common/singleton.h
diff options
context:
space:
mode:
authorYotam Barnoy2010-11-15 13:37:06 +0000
committerYotam Barnoy2010-11-15 13:37:06 +0000
commitfdc2a2cd81ca3547f72a21a12c23ee56cf50faa4 (patch)
tree9491240ce9b84a0ea2842f0e1cd87a9f5060dd41 /common/singleton.h
parent457127d2a6aba99a33b3d1212f1406a8c40dc29e (diff)
downloadscummvm-rg350-fdc2a2cd81ca3547f72a21a12c23ee56cf50faa4.tar.gz
scummvm-rg350-fdc2a2cd81ca3547f72a21a12c23ee56cf50faa4.tar.bz2
scummvm-rg350-fdc2a2cd81ca3547f72a21a12c23ee56cf50faa4.zip
CONFIGMAN: added defragmentation methods for one-plugin-at-a-time
One-plugin-at-a-time can have fragmentation caused by the ConfigManager if a game changes any configuration value. By reallocating and copying over the ConfigManager, we avoid this problem. svn-id: r54243
Diffstat (limited to 'common/singleton.h')
-rw-r--r--common/singleton.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/singleton.h b/common/singleton.h
index 2f721a65f7..e17e401f8b 100644
--- a/common/singleton.h
+++ b/common/singleton.h
@@ -39,8 +39,6 @@ private:
Singleton<T>(const Singleton<T> &);
Singleton<T> &operator=(const Singleton<T> &);
- static T *_singleton;
-
/**
* The default object factory used by the template class Singleton.
* By specialising this template function, one can make a singleton use a
@@ -89,6 +87,8 @@ protected:
#endif
typedef T SingletonBaseType;
+
+ static T *_singleton;
};
/**