git: ce0335c20a5d - 2024Q3 - graphics/vigra: fix build with clang 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 28 Sep 2024 09:48:44 UTC
The branch 2024Q3 has been updated by dim:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ce0335c20a5dc0527b0ea764e1dcd8891b1026ea
commit ce0335c20a5dc0527b0ea764e1dcd8891b1026ea
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-09-08 08:57:41 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-09-28 09:48:23 +0000
graphics/vigra: fix build with clang 19
Clang 19 is more strict about manipulating `this` in C++, which results
in an error compiling graphics/vigra:
/wrkdirs/usr/ports/graphics/vigra/work/vigra-8acd73a/include/vigra/multi_iterator_coupled.hxx:493:9: error: expression is not assignable
493 | --this;
| ^ ~~~~
Here, the intent is to call the prefix operator-- on the object, which
should be spelled either "--*this" or "operator--()".
PR: 281358
Approved by: maintainer timeout (2 weeks)
MFH: 2024Q3
(cherry picked from commit 5a269b5cd4965710fa4e02fdb1cc2ffe6def6921)
---
.../files/patch-include_vigra_multi__iterator__coupled.hxx | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/graphics/vigra/files/patch-include_vigra_multi__iterator__coupled.hxx b/graphics/vigra/files/patch-include_vigra_multi__iterator__coupled.hxx
new file mode 100644
index 000000000000..b9bfe414615d
--- /dev/null
+++ b/graphics/vigra/files/patch-include_vigra_multi__iterator__coupled.hxx
@@ -0,0 +1,11 @@
+--- include/vigra/multi_iterator_coupled.hxx.orig 2018-10-19 16:12:20 UTC
++++ include/vigra/multi_iterator_coupled.hxx
+@@ -490,7 +490,7 @@ class CoupledScanOrderIterator<N, HANDLES, 0>
+ CoupledScanOrderIterator operator--(int)
+ {
+ CoupledScanOrderIterator res(*this);
+- --this;
++ --*this;
+ return res;
+ }
+