[Scummvm-cvs-logs] CVS: scummvm/gui newgui.h,1.49,1.50

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


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

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

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- newgui.h	1 Jan 2005 19:19:05 -0000	1.49
+++ newgui.h	6 Jan 2005 18:38:34 -0000	1.50
@@ -56,7 +56,7 @@
 class NewGui : public Common::Singleton<NewGui> {
 	typedef Common::String String;
 	friend class Dialog;
-	friend SingletonBaseType *makeInstance<>();
+	friend class Common::Singleton<SingletonBaseType>;
 	NewGui();
 public:
 





More information about the Scummvm-git-logs mailing list