From 8a694d7df0598434afd04cdaaf865a24bd1b883c Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Thu, 24 Aug 2006 07:17:08 +0000 Subject: [PATCH] renamed variable small to sdg_small; created conflict with a macro defined when including windows.h --- Segment_Delaunay_graph_2/changes.txt | 5 +++++ .../Segment_Delaunay_graph_2_impl.h | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Segment_Delaunay_graph_2/changes.txt b/Segment_Delaunay_graph_2/changes.txt index c5817a1f149..3665b898d50 100644 --- a/Segment_Delaunay_graph_2/changes.txt +++ b/Segment_Delaunay_graph_2/changes.txt @@ -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. diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h index e94d7858e99..0774adea50a 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h @@ -1315,7 +1315,7 @@ minimize_degree(const Vertex_handle& v) template void Segment_Delaunay_graph_2:: -equalize_degrees(const Vertex_handle& v, Self& small, +equalize_degrees(const Vertex_handle& v, Self& sdg_small, std::map& 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);