diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-11-28 20:49:34 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-11-28 20:49:34 +0000 |
commit | 98e89961818e39f4d146cc40d06603b7ba954f63 (patch) | |
tree | bc7b3692c39fd943ace905a15a4daae02f9602ab /multimedia/k9copy-kde4 | |
parent | 9c8c9cf7637998d78f7883e5aefeeb686a4ecca1 (diff) | |
download | ports-98e89961818e39f4d146cc40d06603b7ba954f63.tar.gz ports-98e89961818e39f4d146cc40d06603b7ba954f63.zip |
multimedia/k9copy-kde4 : fix 'abs is ambiguous
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)
Notes
Notes:
svn path=/head/; revision=427345
Diffstat (limited to 'multimedia/k9copy-kde4')
-rw-r--r-- | multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp b/multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp new file mode 100644 index 000000000000..dedaecc55b6b --- /dev/null +++ b/multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp @@ -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; + } |