diff options
| author | Max Horn | 2005-01-01 19:19:06 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-01 19:19:06 +0000 |
| commit | 74bf578bda4c9adcc70ce4cda7d4617a9b95267c (patch) | |
| tree | b46f1664b5ffd69ebc5623f83444fd7f5de724e2 /gui | |
| parent | c418282ec724d01e37b13f7372aa2d6b48f6cbe2 (diff) | |
| download | scummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.tar.gz scummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.tar.bz2 scummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.zip | |
Changed the singleton code to allow for custom object factories; this allowed me to change OSystem to use the singleton base class, too
svn-id: r16404
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/newgui.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/newgui.h b/gui/newgui.h index 46cf9de657..e8c0eae556 100644 --- a/gui/newgui.h +++ b/gui/newgui.h @@ -56,7 +56,7 @@ typedef Common::FixedStack<Dialog *> DialogStack; class NewGui : public Common::Singleton<NewGui> { typedef Common::String String; friend class Dialog; - friend class Common::Singleton<NewGui>; + friend SingletonBaseType *makeInstance<>(); NewGui(); public: |