[Scummvm-cvs-logs] SF.net SVN: scummvm: [21612] scummvm/trunk/backends/fs

[kirben at users.sourceforge.net]

Revision: 21612
Author:   kirben
Date:     2006-04-04 16:26:11 -0700 (Tue, 04 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21612&view=rev

Log Message:
-----------
Rename variable in FSList::sort() to avoid conflict with system defines

Modified Paths:
--------------
    scummvm/trunk/backends/fs/fs.cpp
    scummvm/trunk/backends/fs/windows/windows-fs.cpp
Modified: scummvm/trunk/backends/fs/fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/fs.cpp	2006-04-04 23:24:51 UTC (rev 21611)
+++ scummvm/trunk/backends/fs/fs.cpp	2006-04-04 23:26:11 UTC (rev 21612)
@@ -27,14 +27,14 @@
 void FSList::sort() {
 	// Simple selection sort
 	for (iterator i = begin(); i != end(); ++i) {
-		iterator min(i);
+		iterator m(i);
 		iterator j(i);
 		++j;
 		for (; j != end(); ++j)
-			if (*j < *min)
-				min = j;
-		if (min != i)
-			SWAP(*min, *i);
+			if (*j < *m)
+				m = j;
+		if (m != i)
+			SWAP(*m, *i);
 	}
 }
 

Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-04-04 23:24:51 UTC (rev 21611)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-04-04 23:26:11 UTC (rev 21612)
@@ -143,8 +143,6 @@
 }
 
 WindowsFilesystemNode::WindowsFilesystemNode(const String &p) {
-	int len = 0, offset = p.size();
-
 	assert(p.size() > 0);
 
 	_path = p;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.