From 93cfd56c8394926fec4f99223022a7bb59d42995 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 20 Nov 2018 16:54:30 +0100 Subject: [PATCH] Fix for VC2017 which has a problem with the conversion to std::pair --- Skin_surface_3/include/CGAL/Skin_surface_base_3.h | 2 +- .../include/CGAL/Triangulated_mixed_complex_observer_3.h | 2 +- Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h | 2 +- Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h index 0b25a37ffb1..4e881316f79 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h @@ -782,7 +782,7 @@ get_weighted_circumcenter(const Simplex &s, Gt2 &traits) } case 2: { - f = s; + f = Facet(s); result = traits.construct_weighted_circumcenter_3_object() (converter(f.first->vertex((f.second+1)&3)->point()), converter(f.first->vertex((f.second+2)&3)->point()), diff --git a/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h b/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h index a3d94a7175c..30c48c22803 100644 --- a/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h +++ b/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h @@ -128,7 +128,7 @@ public: break; } case 2: { - f = s; + f = Rt_Facet(s); Surface_weighted_point p0 = r2s_converter(f.first->vertex((f.second+1)&3)->point()); Surface_weighted_point p1 = diff --git a/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h b/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h index 811ca53da9f..e2f4dc829b9 100644 --- a/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h +++ b/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h @@ -1024,7 +1024,7 @@ get_weighted_circumcenter(Rt_Simplex const &s) r2t_converter_object(e.first->vertex(e.third)->point())); break; case 2: - f=s; + f= Rt_Facet(s); result = weighted_circumcenter_obj( r2t_converter_object(f.first->vertex((f.second+1)&3)->point()), r2t_converter_object(f.first->vertex((f.second+2)&3)->point()), diff --git a/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h b/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h index d1290f07c91..c38b9663c4b 100644 --- a/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h +++ b/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h @@ -558,7 +558,7 @@ get_orthocenter(Rt_Simplex const &s) r2t_converter_object(e.first->vertex(e.third)->point())); break; case 2: - f=s; + f= Rt_Facet(s); result = orthocenter_obj( r2t_converter_object( f.first->vertex((f.second+1)&3)->point()),