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

Fix for compilation conflict on macOS. Error was appearing in case Surface_mesh.h was included in *.mm file

This commit is contained in:
Volodymyr Boichentsov 2017-09-19 10:52:53 +01:00
parent bac0452224
commit 0189c1f0b3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

@ -1098,9 +1098,9 @@ public:
hconn_[hi].prev_halfedge_ = Halfedge_index(size_type(hconn_[hi].prev_halfedge_)+nh); hconn_[hi].prev_halfedge_ = Halfedge_index(size_type(hconn_[hi].prev_halfedge_)+nh);
} }
} }
size_type nil = -1; size_type inf_value = -1;
if(other.vertices_freelist_ != nil){ if(other.vertices_freelist_ != inf_value){
if(vertices_freelist_ != nil){ if(vertices_freelist_ != inf_value){
Vertex_index vi(nv+other.vertices_freelist_); Vertex_index vi(nv+other.vertices_freelist_);
Halfedge_index inf(-1); Halfedge_index inf(-1);
while(vconn_[vi].halfedge_ != inf){ while(vconn_[vi].halfedge_ != inf){
@ -1110,8 +1110,8 @@ public:
} }
vertices_freelist_ = nv + other.vertices_freelist_; vertices_freelist_ = nv + other.vertices_freelist_;
} }
if(other.faces_freelist_ != nil){ if(other.faces_freelist_ != inf_value){
if(faces_freelist_ != nil){ if(faces_freelist_ != inf_value){
Face_index fi(nf+other.faces_freelist_); Face_index fi(nf+other.faces_freelist_);
Halfedge_index inf(-1); Halfedge_index inf(-1);
while(fconn_[fi].halfedge_ != inf){ while(fconn_[fi].halfedge_ != inf){
@ -1121,8 +1121,8 @@ public:
} }
faces_freelist_ = nf + other.faces_freelist_; faces_freelist_ = nf + other.faces_freelist_;
} }
if(other.edges_freelist_ != nil){ if(other.edges_freelist_ != inf_value){
if(edges_freelist_ != nil){ if(edges_freelist_ != inf_value){
Halfedge_index hi((nh>>1)+other.edges_freelist_); Halfedge_index hi((nh>>1)+other.edges_freelist_);
Halfedge_index inf(-1); Halfedge_index inf(-1);
while(hconn_[hi].next_halfedge_ != inf){ while(hconn_[hi].next_halfedge_ != inf){