[Winmerge-svn] SF.net SVN: winmerge:[7499] branches/R2_14/Src

[<ge...@us...>]

Revision: 7499
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7499&view=rev
Author:   gerundt
Date:     2011-01-02 13:55:55 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
Fix a signed vs. unsigned warning

Modified Paths:
--------------
    branches/R2_14/Src/LineFiltersList.cpp
    branches/R2_14/Src/LineFiltersList.h

Modified: branches/R2_14/Src/LineFiltersList.cpp
===================================================================
--- branches/R2_14/Src/LineFiltersList.cpp	2011-01-02 13:52:24 UTC (rev 7498)
+++ branches/R2_14/Src/LineFiltersList.cpp	2011-01-02 13:55:55 UTC (rev 7499)
@@ -105,7 +105,7 @@
  * @return Filter item from the index. If the index is beyond table limit,
  *  return the last item in the list.
  */
-const LineFilterItem & LineFiltersList::GetAt(int ind) const
+const LineFilterItem & LineFiltersList::GetAt(size_t ind) const
 {
 	if (ind < m_items.size())
 		return *m_items[ind];
@@ -166,7 +166,7 @@
 
 	m_pOptionsMgr = pOptionsMgr;
 
-    unsigned int count = m_items.size();
+	size_t count = m_items.size();
 	valuename += _T("/Values");
 	m_pOptionsMgr->InitOption(valuename.c_str(), static_cast<int>(count));
 	count = m_pOptionsMgr->GetInt(valuename.c_str());

Modified: branches/R2_14/Src/LineFiltersList.h
===================================================================
--- branches/R2_14/Src/LineFiltersList.h	2011-01-02 13:52:24 UTC (rev 7498)
+++ branches/R2_14/Src/LineFiltersList.h	2011-01-02 13:55:55 UTC (rev 7499)
@@ -36,7 +36,7 @@
 	int GetCount() const;
 	void Empty();
 	String GetAsString() const;
-	const LineFilterItem & GetAt(int ind) const;
+	const LineFilterItem & GetAt(size_t ind) const;
 	void CloneFrom(const LineFiltersList *list);
 	bool Compare(const LineFiltersList *list) const;
 


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