songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6291 from sloriot/HDS-pointer_arithmetic 

Workaround warnings
This commit is contained in:
Laurent Rineau 2022-02-02 16:36:04 +01:00
parent 859af16cfa ee405caf0c
commit 7e712e84b9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp
View File

@ -37,14 +37,14 @@ public:
// pointer arithmetic, then convert pointer back to handle again. // pointer arithmetic, then convert pointer back to handle again.
Halfedge_handle h = HDS::halfedge_handle(this); // proper handle Halfedge_handle h = HDS::halfedge_handle(this); // proper handle
if ( nxt & 1) if ( nxt & 1)
return HDS::halfedge_handle( &* h + 1); return HDS::halfedge_handle( std::next(&*h) );
return HDS::halfedge_handle( &* h - 1); return HDS::halfedge_handle( std::prev(&*h));
} }
Halfedge_const_handle opposite() const { // same as above Halfedge_const_handle opposite() const { // same as above
Halfedge_const_handle h = HDS::halfedge_handle(this); // proper handle Halfedge_const_handle h = HDS::halfedge_handle(this); // proper handle
if ( nxt & 1) if ( nxt & 1)
return HDS::halfedge_handle( &* h + 1); return HDS::halfedge_handle( std::next(&*h));
return HDS::halfedge_handle( &* h - 1); return HDS::halfedge_handle( std::prev(&*h));
} }
Halfedge_handle next() { Halfedge_handle next() {
return HDS::halfedge_handle((Halfedge*)(nxt & (~ std::ptrdiff_t(1)))); return HDS::halfedge_handle((Halfedge*)(nxt & (~ std::ptrdiff_t(1))));
@ -54,9 +54,9 @@ public:
(~ std::ptrdiff_t(1)))); (~ std::ptrdiff_t(1))));
} }
void set_opposite( Halfedge_handle h) { void set_opposite( Halfedge_handle h) {
CGAL_precondition(( &* h - 1 == &* HDS::halfedge_handle(this)) || CGAL_precondition(( std::prev(&*h) == &* HDS::halfedge_handle(this)) ||
( &* h + 1 == &* HDS::halfedge_handle(this))); ( std::next(&*h)== &* HDS::halfedge_handle(this)));
if ( &* h - 1 == &* HDS::halfedge_handle(this)) if ( std::prev(&*h) == &* HDS::halfedge_handle(this))
nxt |= 1; nxt |= 1;
else else
nxt &= (~ std::ptrdiff_t(1)); nxt &= (~ std::ptrdiff_t(1));