kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

multimedia/k9copy-kde4 : fix 'abs is ambiguous

Browse source 
Work around the call to abs() being ambigous by simply
calculating the absolute value in place.

PR:		214640
Approved by:	just fix it, rakuco (mentor)
This commit is contained in:
Tobias C. Berner 2016-11-28 20:49:34 +00:00
parent 9c8c9cf763
commit 98e8996181
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=427345
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp Normal file
View file

@ -0,0 +1,25 @@
/wrkdirs/usr/ports/multimedia/k9copy-kde4/work/k9copy-2.3.4-Source/src/backup/k9dvdbackup.cpp:888:24: error: call to 'abs' is ambiguous
*_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ;
^~~
/usr/include/stdlib.h:83:6: note: candidate function
int abs(int) __pure2;
^
/usr/include/c++/v1/stdlib.h:115:44: note: candidate function
inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);}
^
/usr/include/c++/v1/stdlib.h:117:44: note: candidate function
inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);}
^
--- src/backup/k9dvdbackup.cpp.orig 2016-11-18 20:25:13 UTC
+++ src/backup/k9dvdbackup.cpp
@@ -885,7 +885,8 @@ k9Vobu * k9DVDBackup::remapOffset(uint32
if ((vobu1 !=NULL) && (vobu2!=NULL)) {
- *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ;
+ uint32_t delta = ( vobu1->newSector > vobu2->newSector ? vobu1->newSector - vobu2->newSector : vobu2->newSector - vobu1->newSector );
+ *_offset = delta | maskOffset1 ;
*_offset |= maskOffset2;
return vobu2;
}