PATCH: [ 941979 ] Add cast to suppress VS.NET 2002 warning

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index de609fa..dd068f1 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -2223,7 +2223,7 @@ void CMergeDoc::PrimeTextBuffers()
                                // left side
                                for (UINT i = curDiff.dbegin0; i <= curDiff.dend0 ; i++)
                                {
-                                       if (curDiff.blank0 == -1 || i < curDiff.blank0)
+                                       if (curDiff.blank0 == -1 || (int)i < curDiff.blank0)
                                        {
                                                // set diff or trivial flag
                                                DWORD dflag = (curDiff.op == OP_DIFF) ? LF_DIFF : LF_TRIVIAL;
@@ -2240,7 +2240,7 @@ void CMergeDoc::PrimeTextBuffers()
                                // right side
                                for (i = curDiff.dbegin1; i <= curDiff.dend1 ; i++)
                                {
-                                       if (curDiff.blank1 == -1 || i < curDiff.blank1)
+                                       if (curDiff.blank1 == -1 || (int)i < curDiff.blank1)
                                        {
                                                // set diff or trivial flag
                                                DWORD dflag = (curDiff.op == OP_DIFF) ? LF_DIFF : LF_TRIVIAL;

diff --git a/Src/readme.txt b/Src/readme.txt
index 9cc5874..b6c80d0 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2004-05-01 Perry
+ PATCH: [ 941979 ] Add cast to suppress VS.NET 2002 warning
+  Src: MergeDoc.cpp
+
 2004-04-30 Christian
  PATCH: [ 941982 ] Fix VS6 compilation
   Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h