From 3201ed1ac8ceb5beebe07f563e64b4e6126b34f9 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Sun, 12 Nov 2006 20:58:14 +0000 Subject: [PATCH] Changed variable name to avoid nameclash when including windows.h --- .../include/CGAL/Envelope_3/Envelope_element_visitor_3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h index 7b3ce6c237e..55fb44c828b 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h @@ -1934,12 +1934,12 @@ protected: typedef typename Minimization_diagram_2::Ccb_halfedge_circulator Ccb_halfedge_circulator; - Copy_observer(Minimization_diagram_2& small, + Copy_observer(Minimization_diagram_2& small_, Minimization_diagram_2& big, Halfedges_map& map_h, Vertices_map& map_v, Faces_map& map_f) - : small_arr(small), big_arr(big), + : small_arr(small_), big_arr(big), big_arr_accessor(big_arr), map_halfedges(map_h), map_vertices(map_v),