Attachment 252667 Details for Bug 280737 – databases/sfcgal: fix build with clang 19

[patch] databases/sfcgal: fix build with clang 19

databases__sfcgal-fix-clang19-build-1.diff (text/plain), 2.87 KB, created by Dimitry Andric on 2024-08-10 19:24:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-08-10 19:24:15 UTC

Size: 2.87 KB

patch

obsolete

>commit ab88bc1fdb08a6841c8ff7cdc04048b97601a8f6
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-08-10T21:17:34+02:00
>
>    databases/sfcgal: fix build with clang 19
>    
>    Clang 19 now diagnoses incorrect member accesses, which causes
>    databases/sfcgal to fail with errors similar to:
>    
>        /wrkdirs/usr/ports/databases/sfcgal/work/CGAL-5.6.1/include/CGAL/boost/graph/iterator.h:219:22: error: no member named 'base' in 'Halfedge_around_source_iterator<Graph>'
>          219 |     return (! (this->base() == nullptr));
>              |                ~~~~  ^
>        /wrkdirs/usr/ports/databases/sfcgal/work/CGAL-5.6.1/include/CGAL/boost/graph/iterator.h:313:22: error: no member named 'base' in 'Halfedge_around_target_iterator<Graph>'
>          313 |     return (! (this->base() == nullptr));
>              |                ~~~~  ^
>        /wrkdirs/usr/ports/databases/sfcgal/work/CGAL-5.6.1/include/CGAL/boost/graph/iterator.h:405:22: error: no member named 'base' in 'Halfedge_around_face_iterator<Graph>'
>          405 |     return (! (this->base() == nullptr));
>              |                ~~~~  ^
>    
>    Upstream fixed this in https://github.com/CGAL/cgal/commit/0de060acd68
>    but it does not apply easily due to some changed context. Add a
>    backported patch instead.
>    
>    PR:             280737
>    MFH:            2024Q3
>
>diff --git a/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h b/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h
>new file mode 100644
>index 000000000000..b02e6b3a1723
>--- /dev/null
>+++ b/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h
>@@ -0,0 +1,38 @@
>+--- ../CGAL-5.6.1/include/CGAL/boost/graph/iterator.h	2024-02-24 21:04:12 UTC
>++++ ../CGAL-5.6.1/include/CGAL/boost/graph/iterator.h
>+@@ -214,11 +214,6 @@ class Halfedge_around_source_iterator { (public)
>+ 
>+ #ifndef DOXYGEN_RUNNING
>+ 
>+-  explicit operator bool() const
>+-  {
>+-    return (! (this->base() == nullptr));
>+-  }
>+-
>+   bool operator==( const Self& i) const {
>+     CGAL_assertion( anchor == anchor);
>+     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
>+@@ -308,11 +303,6 @@ class Halfedge_around_target_iterator { (public)
>+ 
>+ #ifndef DOXYGEN_RUNNING
>+ 
>+-  explicit operator bool() const
>+-  {
>+-    return (! (this->base() == nullptr));
>+-  }
>+-
>+   bool operator==( const Self& i) const {
>+     CGAL_assertion( anchor == anchor);
>+     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
>+@@ -399,11 +389,6 @@ class Halfedge_around_face_iterator { (public)
>+   const value_type& operator *  ( ) const { return  pos; }
>+   pointer           operator -> ( )       { return &pos; }
>+   const value_type* operator -> ( ) const { return &pos; }
>+-
>+-  explicit operator bool() const
>+-  {
>+-    return (! (this->base() == nullptr));
>+-  }
>+ 
>+   bool operator==( const Self& i) const {
>+     CGAL_assertion( anchor == anchor);

Actions: View | Diff

Attachments on bug 280737: 252667