diff options
| author | Slávek Banko <[email protected]> | 2016-09-03 16:55:00 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2016-09-03 16:55:11 +0200 |
| commit | a11d0b82f87d7342f3f6213d678c166d4964be88 (patch) | |
| tree | 630608370225423ef8e317c58949e99ef03c9de3 | |
| parent | 03af0c40cb19e918d73b861a273f8659a1ed8604 (diff) | |
| download | tdeutils-a11d0b82f87d7342f3f6213d678c166d4964be88.tar.gz tdeutils-a11d0b82f87d7342f3f6213d678c166d4964be88.zip | |
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 785a180341c7a5200bef31bcebc9851bc63d8ea9)
| -rw-r--r-- | khexedit/lib/kbigbuffer.cpp | 2 | ||||
| -rw-r--r-- | kregexpeditor/regexpconverter.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/khexedit/lib/kbigbuffer.cpp b/khexedit/lib/kbigbuffer.cpp index 99925da..b3be8a9 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 0010102..94b21e0 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. } |