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

renamed variable small to sdg_small; created conflict with 

a macro defined when including windows.h
This commit is contained in:
Menelaos Karavelas 2006-08-24 07:17:08 +00:00
parent 59b1bb35ca
commit 8a694d7df0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Segment_Delaunay_graph_2/changes.txt
View File

@ -1,3 +1,8 @@
24 August 2006: Menelaos Karavelas
- in Segment_Delaunay_graph_2_impl.h renamed variable small to
sdg_small; created conflict with a macro defined when including
windows.h
10 August 2006: Menelaos Karavelas
- this is the version to be sent to Pulsic.com; added this note so that
I can retrieve the revision number of the package sent.

10
Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h
View File

@ -1315,7 +1315,7 @@ minimize_degree(const Vertex_handle& v)
template<class Gt, class ST, class DS, class LTag>
void
Segment_Delaunay_graph_2<Gt,ST,DS,LTag>::
equalize_degrees(const Vertex_handle& v, Self& small,
equalize_degrees(const Vertex_handle& v, Self& sdg_small,
std::map<Vertex_handle,Vertex_handle>& vmap,
List& l) const
{
@ -1379,8 +1379,8 @@ equalize_degrees(const Vertex_handle& v, Self& small,
std::cerr << "size of l: " << l.size() << std::endl;
Edge e_small_new = small.flip(e_small);
Edge e_small_new_sym = small.sym_edge(e_small_new);
Edge e_small_new = sdg_small.flip(e_small);
Edge e_small_new_sym = sdg_small.sym_edge(e_small_new);
Face_handle f1 = e_small_new.first;
Face_handle f2 = e_small_new_sym.first;
@ -1394,11 +1394,11 @@ equalize_degrees(const Vertex_handle& v, Self& small,
Edge to_list1(f1, cw(e_small_new.second));
Edge to_list2(f2, ccw(e_small_new_sym.second));
e_small = small.sym_edge(to_list1);
e_small = sdg_small.sym_edge(to_list1);
l.insert_after(e_small_prev, e_small);
std::cerr << "size of l: " << l.size() << std::endl;
l.insert_after(e_small, small.sym_edge(to_list2));
l.insert_after(e_small, sdg_small.sym_edge(to_list2));
std::cerr << "size of l: " << l.size() << std::endl;
} else {
e_small = l.next(e_small);