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

Fix for VC2017 which has a problem with the conversion to std::pair

This commit is contained in:
Andreas Fabri 2018-11-20 16:54:30 +01:00
parent 641efa944b
commit 93cfd56c83
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Skin_surface_3/include/CGAL/Skin_surface_base_3.h
View File

@ -782,7 +782,7 @@ get_weighted_circumcenter(const Simplex &s, Gt2 &traits)
} }
case 2: case 2:
{ {
f = s; f = Facet(s);
result = traits.construct_weighted_circumcenter_3_object() result = traits.construct_weighted_circumcenter_3_object()
(converter(f.first->vertex((f.second+1)&3)->point()), (converter(f.first->vertex((f.second+1)&3)->point()),
converter(f.first->vertex((f.second+2)&3)->point()), converter(f.first->vertex((f.second+2)&3)->point()),

2
Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h
View File

@ -128,7 +128,7 @@ public:
break; break;
} }
case 2: { case 2: {
f = s; f = Rt_Facet(s);
Surface_weighted_point p0 = Surface_weighted_point p0 =
r2s_converter(f.first->vertex((f.second+1)&3)->point()); r2s_converter(f.first->vertex((f.second+1)&3)->point());
Surface_weighted_point p1 = Surface_weighted_point p1 =

2
Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h
View File

@ -1024,7 +1024,7 @@ get_weighted_circumcenter(Rt_Simplex const &s)
r2t_converter_object(e.first->vertex(e.third)->point())); r2t_converter_object(e.first->vertex(e.third)->point()));
break; break;
case 2: case 2:
f=s; f= Rt_Facet(s);
result = weighted_circumcenter_obj( result = weighted_circumcenter_obj(
r2t_converter_object(f.first->vertex((f.second+1)&3)->point()), r2t_converter_object(f.first->vertex((f.second+1)&3)->point()),
r2t_converter_object(f.first->vertex((f.second+2)&3)->point()), r2t_converter_object(f.first->vertex((f.second+2)&3)->point()),

2
Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h
View File

@ -558,7 +558,7 @@ get_orthocenter(Rt_Simplex const &s)
r2t_converter_object(e.first->vertex(e.third)->point())); r2t_converter_object(e.first->vertex(e.third)->point()));
break; break;
case 2: case 2:
f=s; f= Rt_Facet(s);
result = orthocenter_obj( result = orthocenter_obj(
r2t_converter_object( r2t_converter_object(
f.first->vertex((f.second+1)&3)->point()), f.first->vertex((f.second+1)&3)->point()),