[Scummvm-cvs-logs] CVS: scummvm/gui ListWidget.h,1.1,1.2

Max Horn fingolfin at users.sourceforge.net
Thu Jul 11 16:10:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv25301/gui

Modified Files:
	ListWidget.h 
Log Message:
seems there is a conflict with our operator new and certain versions of the Std C++ lib. Till this is resolved: here's a workaround (disabling the code which is not used anyway right now)

Index: ListWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ListWidget.h	10 Jul 2002 22:49:41 -0000	1.1
+++ ListWidget.h	11 Jul 2002 23:09:07 -0000	1.2
@@ -24,9 +24,10 @@
 #include "widget.h"
 
 // FIXME - use own list class later, this is for rapid development
-#include <string>
-#include <vector>
-typedef	std::vector<std::string>	StringList;
+//#include <string>
+//#include <vector>
+//typedef	std::vector<std::string>	StringList;
+typedef int StringList;	// FIXME placeholder
 
 
 enum {





More information about the Scummvm-git-logs mailing list