From 957c8d7c86f0a3e65da7629026da64c4440ebd08 Mon Sep 17 00:00:00 2001 From: Michael Hemmer Date: Mon, 15 Aug 2011 11:23:04 +0000 Subject: [PATCH] fix Multiplicity issues not covered by test in Arrangement/test --- .../demo/Arrangement_on_surface_2/demo_tab.h | 2 ++ Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h | 1 + .../include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h | 1 + 3 files changed, 4 insertions(+) diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/demo_tab.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/demo_tab.h index 25fa000a06f..330b84e68e6 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/demo_tab.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/demo_tab.h @@ -288,6 +288,8 @@ private: typedef typename Arrangement_2::Induced_edge_iterator Induced_edge_iterator; typedef typename Arrangement_2::Curve_handle Curve_handle; typedef CGAL::Envelope_diagram_1 Diagram_1; + + typedef typename Traits::Multiplicity Multiplicity; private: // function object - FillFace diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h index af4e3a82fd5..cfb8241d6b2 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h @@ -217,6 +217,7 @@ public: typedef typename Base::Point_2 Point_2; typedef typename Base::X_monotone_curve_2 X_monotone_curve_2; typedef typename Base::Curve_2 Curve_2; + typedef typename Base::Multiplicity Multiplicity; /*! A functor that compares the x-coordinates of two points */ class Compare_x_2 { diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h index 49fb5934a8b..9d1f7ad53d1 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h @@ -65,6 +65,7 @@ public: typedef typename Traits_2::X_monotone_curve_2 Base_x_monotone_curve_2; typedef typename Traits_2::Point_2 Base_point_2; + typedef typename Traits_2::Multiplicity Multiplicity; typedef typename Traits_2::Compare_x_2 Base_compare_x_2; typedef typename Traits_2::Compare_xy_2 Base_compare_xy_2;