[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.h,1.7,1.8

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


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

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

Index: audiocd.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- audiocd.h	1 Jan 2005 19:19:06 -0000	1.7
+++ audiocd.h	6 Jan 2005 18:38:34 -0000	1.8
@@ -54,7 +54,7 @@
 	Status getStatus() const;
 
 private:
-	friend SingletonBaseType *makeInstance<>();
+	friend class Common::Singleton<SingletonBaseType>;
 	AudioCDManager();
 
 	int getCachedTrack(int track);





More information about the Scummvm-git-logs mailing list