[Scummvm-cvs-logs] CVS: scummvm/backends/fs/windows windows-fs.cpp,1.28,1.29

Max Horn fingolfin at users.sourceforge.net
Mon May 9 01:48:49 CEST 2005


Update of /cvsroot/scummvm/scummvm/backends/fs/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1989/backends/fs/windows

Modified Files:
	windows-fs.cpp 
Log Message:
Why not fix the warning if you encounter it? :-)

Index: windows-fs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/windows/windows-fs.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- windows-fs.cpp	16 Mar 2005 22:58:42 -0000	1.28
+++ windows-fs.cpp	9 May 2005 08:47:09 -0000	1.29
@@ -54,7 +54,7 @@
 
 private:
 	static char *toAscii(TCHAR *x);
-	static TCHAR* toUnicode(const char *x);
+	static const TCHAR* toUnicode(const char *x);
 	static void addFile (FSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data);
 };
 
@@ -70,9 +70,9 @@
 #endif
 }
 
-TCHAR* WindowsFilesystemNode::toUnicode(const char *x) {
+const TCHAR* WindowsFilesystemNode::toUnicode(const char *x) {
 #ifndef UNICODE
-	return (TCHAR *)x;
+	return (const TCHAR *)x;
 #else
 	static TCHAR unicodeString[MAX_PATH];
 	MultiByteToWideChar(CP_ACP, 0, x, strlen(x) + 1, unicodeString, sizeof(unicodeString) / sizeof(TCHAR));





More information about the Scummvm-git-logs mailing list