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

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

Revision: 3597
          http://svn.sourceforge.net/winmerge/?rev=3597&view=rev
Author:   kimmov
Date:     2006-09-21 10:09:31 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Fix 64-bit typecast warning

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/GhostTextBuffer.h

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-09-21 16:49:15 UTC (rev 3596)
+++ trunk/Src/Changes.txt	2006-09-21 17:09:31 UTC (rev 3597)
@@ -7,6 +7,8 @@
   Src: Splash.cpp
  Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
   ShellExtension: ShellExtension.rc
+ Fix 64-bit typecast warning
+  Src: GhostTextBuffer.h
 
 2006-09-20 Kimmo
  PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage

Modified: trunk/Src/GhostTextBuffer.h
===================================================================
--- trunk/Src/GhostTextBuffer.h	2006-09-21 16:49:15 UTC (rev 3596)
+++ trunk/Src/GhostTextBuffer.h	2006-09-21 17:09:31 UTC (rev 3597)
@@ -156,10 +156,10 @@
 			m_nRealLinesCreated = src.m_nRealLinesCreated;
 			m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock;
 			SetText(src.GetText());
-			int size = src.m_paSavedRevisonNumbers->GetSize();
+			INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
 			m_paSavedRevisonNumbers = new CDWordArray();
 			m_paSavedRevisonNumbers->SetSize(size);
-			int i;
+			INT_PTR i;
 			for (i = 0; i < size; i++)
 				(*m_paSavedRevisonNumbers)[i] = (*src.m_paSavedRevisonNumbers)[i];
 			return *this;


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