[Winmerge-svn] SF.net SVN: winmerge:[6687] trunk/Src

[<ki...@us...>]

Revision: 6687
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6687&view=rev
Author:   kimmov
Date:     2009-04-21 14:12:15 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
Couple of type fixes for 64-bit build.

Modified Paths:
--------------
    trunk/Src/Common/OptionsMgr.cpp
    trunk/Src/FilterList.cpp
    trunk/Src/MergeCmdLineInfo.cpp

Modified: trunk/Src/Common/OptionsMgr.cpp
===================================================================
--- trunk/Src/Common/OptionsMgr.cpp	2009-04-21 14:10:34 UTC (rev 6686)
+++ trunk/Src/Common/OptionsMgr.cpp	2009-04-21 14:12:15 UTC (rev 6687)
@@ -155,7 +155,7 @@
 {
 	if (str == NULL)
 		return false;
-	int len = _tcslen(str);
+	const size_t len = _tcslen(str);
 	if (len == 0)
 		return false;
 
@@ -519,8 +519,8 @@
 	OptionsMap::const_iterator found = m_optionsMap.find(name);
 	if (found != m_optionsMap.end())
 	{
-		BOOL succeeded = m_optionsMap.erase(name);
-		if (!succeeded)
+		size_t nr_removed = m_optionsMap.erase(name);
+		if (nr_removed == 0)
 			retVal = OPT_NOTFOUND;
 	}
 	else

Modified: trunk/Src/FilterList.cpp
===================================================================
--- trunk/Src/FilterList.cpp	2009-04-21 14:10:34 UTC (rev 6686)
+++ trunk/Src/FilterList.cpp	2009-04-21 14:12:15 UTC (rev 6687)
@@ -110,8 +110,8 @@
 bool FilterList::Match(const char *string, int codepage/*=CP_UTF8*/)
 {
 	bool retval = false;
-	unsigned int count = m_list.size();
-	int stringlen = strlen(string);
+	const size_t count = m_list.size();
+	size_t stringlen = strlen(string);
 
 	// convert string into UTF-8
 	ucr::buffer buf(stringlen * 2);

Modified: trunk/Src/MergeCmdLineInfo.cpp
===================================================================
--- trunk/Src/MergeCmdLineInfo.cpp	2009-04-21 14:10:34 UTC (rev 6686)
+++ trunk/Src/MergeCmdLineInfo.cpp	2009-04-21 14:12:15 UTC (rev 6687)
@@ -230,7 +230,7 @@
 	param = paths_GetLongPath(param.c_str());
 
 	// Set flag indicating path is from command line
-	const int ord = m_Files.size();
+	const size_t ord = m_Files.size();
 	if (ord == 0)
 		m_dwLeftFlags |= FFILEOPEN_CMDLINE;
 	else if (ord == 1)


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