Mercurial > hg > easyhg-kdiff3

diff kdiff3/src-QT4/diff.h @ 113:7bca1f1340f6 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build fixes for Xcode 10 / Qt 5.12
author Chris Cannam
date Mon, 17 Dec 2018 11:13:01 +0000
parents fcd146072e0c
children
line wrap: on
line diff
--- a/kdiff3/src-QT4/diff.h	Fri Dec 07 13:40:01 2018 +0000
+++ b/kdiff3/src-QT4/diff.h	Mon Dec 17 11:13:01 2018 +0000
@@ -115,7 +115,7 @@
       pFineAB=0; pFineBC=0; pFineCA=0;
    }
 
-   bool operator==( const Diff3Line& d3l )
+   bool operator==( const Diff3Line& d3l ) const
    {
       return lineA == d3l.lineA  &&  lineB == d3l.lineB  &&  lineC == d3l.lineC  
          && bAEqB == d3l.bAEqB  && bAEqC == d3l.bAEqC  && bBEqC == d3l.bBEqC;