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

Max Horn fingolfin at users.sourceforge.net
Thu Jan 6 10:39:21 CET 2005


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

Modified Files:
	plugins.h 
Log Message:
Modify the singleton code once more to help overcome an issue with MSVC 7 (see also patch #1095133)

Index: plugins.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- plugins.h	1 Jan 2005 19:19:04 -0000	1.24
+++ plugins.h	6 Jan 2005 18:38:33 -0000	1.25
@@ -117,7 +117,7 @@
 	
 	bool tryLoadPlugin(Plugin *plugin);
 	
-	friend SingletonBaseType *makeInstance<>();
+	friend class Common::Singleton<SingletonBaseType>;
 	PluginManager();
 
 public:





More information about the Scummvm-git-logs mailing list