[Scummvm-cvs-logs] CVS: scummvm/base plugins.h,1.23,1.24

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4920/base

Modified Files:
	plugins.h 
Log Message:
Changed the singleton code to allow for custom object factories; this allowed me to change OSystem to use the singleton base class, too

Index: plugins.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- plugins.h	1 Jan 2005 16:08:49 -0000	1.23
+++ plugins.h	1 Jan 2005 19:19:04 -0000	1.24
@@ -103,6 +103,8 @@
 typedef Common::Array<Plugin *> PluginList;
 
 
+class PluginManager;
+
 /**
  * Instances of this class manage all plugins, including loading them,
  * making wrapper objects of class Plugin available, and unloading them.
@@ -115,7 +117,7 @@
 	
 	bool tryLoadPlugin(Plugin *plugin);
 	
-	friend class Common::Singleton<PluginManager>;
+	friend SingletonBaseType *makeInstance<>();
 	PluginManager();
 
 public: