[Scummvm-cvs-logs] CVS: scummvm/common list.h,1.23,1.24 singleton.h,1.12,1.13

[Pawel Kolodziejski]

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

Modified Files:
	list.h singleton.h 
Log Message:
fixed compilation for evc4 and vc7

Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/list.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- list.h	8 May 2005 21:49:32 -0000	1.23
+++ list.h	9 May 2005 22:39:16 -0000	1.24
@@ -33,6 +33,10 @@
 template <class T>
 class List {
 protected:
+#if defined (_WIN32_WCE) || (_MSC_VER)
+//FIXME evc4 and msvc7 doesn't like it as protected member
+public:
+#endif
 	struct NodeBase {
 		NodeBase *_prev;
 		NodeBase *_next;

Index: singleton.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/singleton.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- singleton.h	27 Jan 2005 21:29:29 -0000	1.12
+++ singleton.h	9 May 2005 22:39:16 -0000	1.13
@@ -45,8 +45,8 @@
 	 * and you specialise makeInstance to return an instance of a subclass.
 	 */
 	//template <class T>
-#ifdef _WIN32_WCE
-//FIXME
+#if defined (_WIN32_WCE) || (_MSC_VER)
+//FIXME evc4 and msvc7 doesn't like it as private member
 public:
 #endif
 	static T* makeInstance() {