[Winmerge-svn] SF.net SVN: winmerge:[7494] branches/R2_14/Src

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

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

Log Message:
-----------
Make SanityCheckDiff() a const method. Its task is to check diffs not modify anything.

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

Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp	2011-01-02 13:21:40 UTC (rev 7493)
+++ branches/R2_14/Src/MergeDoc.cpp	2011-01-02 13:26:21 UTC (rev 7494)
@@ -809,7 +809,7 @@
  * @param [in] dr Difference to check.
  * @return TRUE if difference lines match, FALSE otherwise.
  */
-bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr)
+bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr) const
 {
 	int cd_dbegin = dr.dbegin0;
 	int cd_dend = dr.dend0;

Modified: branches/R2_14/Src/MergeDoc.h
===================================================================
--- branches/R2_14/Src/MergeDoc.h	2011-01-02 13:21:40 UTC (rev 7493)
+++ branches/R2_14/Src/MergeDoc.h	2011-01-02 13:26:21 UTC (rev 7494)
@@ -162,7 +162,7 @@
 	bool Undo();
 	void CopyAllList(int srcPane, int dstPane);
 	void CopyMultipleList(int srcPane, int dstPane, int firstDiff, int lastDiff);
-	bool SanityCheckDiff(DIFFRANGE dr);
+	bool SanityCheckDiff(DIFFRANGE dr) const;
 	bool ListCopy(int srcPane, int dstPane, int nDiff = -1, bool bGroupWithPrevious = false);
 	bool TrySaveAs(CString &strPath, int &nLastErrorCode, String & sError,
 		int nBuffer, PackingInfo * pInfoTempUnpacker);


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