[Winmerge-svn] SF.net SVN: winmerge:[7495] branches/R2_14/Src/MergeDoc.cpp

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

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

Log Message:
-----------
Make few variables consts.

Modified Paths:
--------------
    branches/R2_14/Src/MergeDoc.cpp

Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp	2011-01-02 13:26:21 UTC (rev 7494)
+++ branches/R2_14/Src/MergeDoc.cpp	2011-01-02 13:31:42 UTC (rev 7495)
@@ -811,8 +811,8 @@
  */
 bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr) const
 {
-	int cd_dbegin = dr.dbegin0;
-	int cd_dend = dr.dend0;
+	const int cd_dbegin = dr.dbegin0;
+	const int cd_dend = dr.dend0;
 
 	// Must ensure line number is in range before getting line flags
 	if (cd_dend >= m_ptBuf[0]->GetLineCount())
@@ -892,9 +892,9 @@
 		CDiffTextBuffer& sbuf = *m_ptBuf[srcPane];
 		CDiffTextBuffer& dbuf = *m_ptBuf[dstPane];
 		BOOL bSrcWasMod = sbuf.IsModified();
-		int cd_dbegin = srcPane == 0 ? cd.dbegin0 : cd.dbegin1;
-		int cd_dend = srcPane == 0 ? cd.dend0 : cd.dend1;
-		int cd_blank = srcPane == 0 ? cd.blank0 : cd.blank1;
+		const int cd_dbegin = srcPane == 0 ? cd.dbegin0 : cd.dbegin1;
+		const int cd_dend = srcPane == 0 ? cd.dend0 : cd.dend1;
+		const int cd_blank = srcPane == 0 ? cd.blank0 : cd.blank1;
 		bool bInSync = SanityCheckDiff(cd);
 
 		if (!bInSync)


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