[Winmerge-svn] SF.net SVN: winmerge:[7175] trunk/Src/DirViewColItems.cpp

[<jt...@us...>]

Revision: 7175
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7175&view=rev
Author:   jtuc
Date:     2010-06-02 14:51:43 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
VC2010 does not accept a dot to serve as a class resolution operator

Modified Paths:
--------------
    trunk/Src/DirViewColItems.cpp

Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp	2010-06-02 06:24:43 UTC (rev 7174)
+++ trunk/Src/DirViewColItems.cpp	2010-06-02 14:51:43 UTC (rev 7175)
@@ -228,8 +228,8 @@
 	{
 		int i_ahead = s.find('\\', i);
 		int j_ahead = t.find('\\', j);
-		int length_s = (i_ahead != std::string.npos ? i_ahead : s.length()) - i;
-		int length_t = (j_ahead != std::string.npos ? j_ahead : t.length()) - j;
+		int length_s = (i_ahead != String::npos ? i_ahead : s.length()) - i;
+		int length_t = (j_ahead != String::npos ? j_ahead : t.length()) - j;
 		if (length_s != length_t ||
 			!StrIsIntlEqual(FALSE, s.c_str() + i, t.c_str() + j, length_s))
 		{


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