From a11d0b82f87d7342f3f6213d678c166d4964be88 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sat, 3 Sep 2016 16:55:00 +0200 Subject: Fix FTBFS with GCC6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 785a180341c7a5200bef31bcebc9851bc63d8ea9) --- khexedit/lib/kbigbuffer.cpp | 2 +- kregexpeditor/regexpconverter.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/khexedit/lib/kbigbuffer.cpp b/khexedit/lib/kbigbuffer.cpp index 99925dae..b3be8a97 100644 --- a/khexedit/lib/kbigbuffer.cpp +++ b/khexedit/lib/kbigbuffer.cpp @@ -170,7 +170,7 @@ bool KBigBuffer::ensurePageLoaded( unsigned int PageIndex ) const if( NoOfFreePages < 1 ) { // free the page which is the furthest away from the page we are loading - if( abs(FirstPage-PageIndex) > abs(LastPage-PageIndex) ) + if( labs(FirstPage-PageIndex) > labs(LastPage-PageIndex) ) while( !freePage(FirstPage++) ); else while( !freePage(LastPage--) ); diff --git a/kregexpeditor/regexpconverter.cpp b/kregexpeditor/regexpconverter.cpp index 00101025..94b21e0f 100644 --- a/kregexpeditor/regexpconverter.cpp +++ b/kregexpeditor/regexpconverter.cpp @@ -33,7 +33,9 @@ RegExpConverter* RegExpConverter::_current = 0; RegExp* RegExpConverter::parse( const TQString&, bool* ok ) { - ok = false; + if(ok) { + *ok = false; + } return new DotRegExp( false ); // This method should never be called. } -- cgit v1.2.3