[Winmerge-svn] SF.net SVN: winmerge: [3974] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-12-18 18:58:03
|
Revision: 3974 http://svn.sourceforge.net/winmerge/?rev=3974&view=rev Author: kimmov Date: 2006-12-18 10:57:59 -0800 (Mon, 18 Dec 2006) Log Message: ----------- PATCH: [ 1617502 ] Cleanup use of enum in MovedLines Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/MovedLines.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-17 22:33:59 UTC (rev 3973) +++ trunk/Src/Changes.txt 2006-12-18 18:57:59 UTC (rev 3974) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-12-18 Kimmo + PATCH: [ 1617502 ] Cleanup use of enum in MovedLines + Src: MovedLines.cpp + 2006-12-17 Gal BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled Src: MergeEditView.cpp Modified: trunk/Src/MovedLines.cpp =================================================================== --- trunk/Src/MovedLines.cpp 2006-12-17 22:33:59 UTC (rev 3973) +++ trunk/Src/MovedLines.cpp 2006-12-18 18:57:59 UTC (rev 3974) @@ -25,7 +25,7 @@ void MovedLines::Add(ML_SIDE side1, unsigned int line1, unsigned int line2) { MovedLineMap * list = NULL; - if (side1 == ML_SIDE::SIDE_LEFT) + if (side1 == SIDE_LEFT) list = &m_moved0; else list = &m_moved1; @@ -40,7 +40,7 @@ */ int MovedLines::LineInBlock(unsigned int line, ML_SIDE side) { - if (side == ML_SIDE::SIDE_LEFT) + if (side == SIDE_LEFT) return SecondSideInMovedBlock(line); else return FirstSideInMovedBlock(line); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |