From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 4 Feb 2018 11:14:11 +0000 (+0900)
Subject: MovedBlockes.cpp: Attempt to fix the bug sf.net#2174
X-Git-Tag: 2.16.5~791
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3c3cff545a28b459fa1ab9a53bb5c23857dc2e5;p=winmerge-jp%2Fwinmerge-jp.git

MovedBlockes.cpp: Attempt to fix the bug sf.net#2174
---

diff --git a/Src/MovedBlocks.cpp b/Src/MovedBlocks.cpp
index 2a61549b5..cbe3f33d7 100644
--- a/Src/MovedBlocks.cpp
+++ b/Src/MovedBlocks.cpp
@@ -148,8 +148,8 @@ extern "C" void moved_block_analysis(struct change ** pscript, struct file_data
 			EqGroup * pgroup1 = map.find(fd[1].equivs[j1]);
 			if (pgroup0 != pgroup1)
 				break;
-			pgroup0->m_lines0.Remove(i1);
-			pgroup1->m_lines1.Remove(j1);
+//			pgroup0->m_lines0.Remove(i1); // commented out this line although I'm not sure what this line means because this line causes the bug sf.net#2174
+//			pgroup1->m_lines1.Remove(j1);
 		}
 		++i1;
 		++j1;
@@ -164,8 +164,8 @@ extern "C" void moved_block_analysis(struct change ** pscript, struct file_data
 			EqGroup * pgroup1 = map.find(fd[1].equivs[j2]);
 			if (pgroup0 != pgroup1)
 				break;
-			pgroup0->m_lines0.Remove(i2);
-			pgroup1->m_lines1.Remove(j2);
+//			pgroup0->m_lines0.Remove(i2); // commented out this line although I'm not sure what this line means because this line causes the bug sf.net#2174
+//			pgroup1->m_lines1.Remove(j2);
 		}
 		--i2;
 		--j2;
@@ -266,8 +266,8 @@ extern "C" void moved_block_analysis(struct change ** pscript, struct file_data
 			EqGroup * pgroup1 = map.find(fd[1].equivs[j1]);
 			if (pgroup0 != pgroup1)
 				break;
-			pgroup0->m_lines0.Remove(i1);
-			pgroup1->m_lines1.Remove(j1);
+//			pgroup0->m_lines0.Remove(i1); // commented out this line although I'm not sure what this line means because this line causes the bug sf.net#2174
+//			pgroup1->m_lines1.Remove(j1);
 		}
 		++i1;
 		++j1;
@@ -282,8 +282,8 @@ extern "C" void moved_block_analysis(struct change ** pscript, struct file_data
 			EqGroup * pgroup1 = map.find(fd[1].equivs[j2]);
 			if (pgroup0 != pgroup1)
 				break;
-			pgroup0->m_lines0.Remove(i2);
-			pgroup1->m_lines1.Remove(j2);
+//			pgroup0->m_lines0.Remove(i2); // commented out this line although I'm not sure what this line means because this line causes the bug sf.net#2174
+//			pgroup1->m_lines1.Remove(j2);
 		}
 		--i2;
 		--j2;