summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 16:55:00 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-03 16:55:00 +0200
commit785a180341c7a5200bef31bcebc9851bc63d8ea9 (patch)
treee191746ace380b9e2e4e311ea89566d02fd2b106
parente5a3116cffdf87b13912803006311262219aeb7b (diff)
downloadtdeutils-785a1803.tar.gz
tdeutils-785a1803.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--khexedit/lib/kbigbuffer.cpp2
-rw-r--r--kregexpeditor/regexpconverter.cpp4
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.
}