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

View File

@ -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()),

View File

@ -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 =

View File

@ -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()),

View File

@ -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()),