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

Fix and also replace dynamic cast in Compute_weight functors

This commit is contained in:
Andreas Fabri 2021-06-11 10:57:43 +02:00
parent 9adf4385ff
commit 0f5bc1a8ef
1 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Filtered_kernel/include/CGAL/Lazy_kernel.h
View File

@ -336,11 +336,32 @@ public:
FT FT
> LR; > LR;
typedef Lazy_rep_n<typename Approximate_kernel::Weighted_point_2,
typename Exact_kernel::Weighted_point_2,
typename Approximate_kernel::Construct_weighted_point_2,
typename Exact_kernel::Construct_weighted_point_2,
E2A_,
Return_base_tag,
Point_2,
int
> LRint;
LR * lr = dynamic_cast<LR*>(p.ptr());
if(lr && (! lr->et)){ auto&& t = typeid(*p.ptr());
return std::get<2>(lr->l); if(t.name() == typeid(LR).name()){
LR * lr = static_cast<LR*>(p.ptr());
if(lr->is_lazy()){
return std::get<2>(lr->l);
}
}else{
if(t.name() == typeid(LRint).name()){
LRint* lrint = static_cast<LRint*>(p.ptr());
if(lrint->is_lazy()){
return std::get<2>(lrint->l);
}
}
} }
return BaseClass().compute_weight_2_object()(p); return BaseClass().compute_weight_2_object()(p);
} }
@ -366,11 +387,32 @@ public:
FT FT
> LR; > LR;
typedef Lazy_rep_n<typename Approximate_kernel::Weighted_point_3,
typename Exact_kernel::Weighted_point_3,
typename Approximate_kernel::Construct_weighted_point_3,
typename Exact_kernel::Construct_weighted_point_3,
E2A_,
Return_base_tag,
Point_3,
int
> LRint;
LR * lr = dynamic_cast<LR*>(p.ptr());
if(lr && (! lr->et)){ auto&& t = typeid(*p.ptr());
return std::get<2>(lr->l); if(t.name() == typeid(LR).name()){
LR * lr = static_cast<LR*>(p.ptr());
if(lr->is_lazy()){
return std::get<2>(lr->l);
}
}else{
if(t.name() == typeid(LRint).name()){
LRint* lrint = static_cast<LRint*>(p.ptr());
if(lrint->is_lazy()){
return std::get<2>(lrint->l);
}
}
} }
return BaseClass().compute_weight_3_object()(p); return BaseClass().compute_weight_3_object()(p);
} }
@ -416,11 +458,15 @@ public:
auto&& t = typeid(*p.ptr()); auto&& t = typeid(*p.ptr());
if(t.name() == typeid(LR).name()){ if(t.name() == typeid(LR).name()){
LR * lr = static_cast<LR*>(p.ptr()); LR * lr = static_cast<LR*>(p.ptr());
return std::get<1>(lr->l); if(lr->is_lazy()){
return std::get<1>(lr->l);
}
}else{ }else{
if(t.name() == typeid(LRint).name()){ if(t.name() == typeid(LRint).name()){
LRint* lrint = static_cast<LRint*>(p.ptr()); LRint* lrint = static_cast<LRint*>(p.ptr());
return std::get<1>(lrint->l); if(lrint->is_lazy()){
return std::get<1>(lrint->l);
}
} }
} }
@ -469,11 +515,15 @@ public:
auto&& t = typeid(*p.ptr()); auto&& t = typeid(*p.ptr());
if(t.name() == typeid(LR).name()){ if(t.name() == typeid(LR).name()){
LR * lr = static_cast<LR*>(p.ptr()); LR * lr = static_cast<LR*>(p.ptr());
return std::get<1>(lr->l); if(lr->is_lazy()){
return std::get<1>(lr->l);
}
}else{ }else{
if(t.name() == typeid(LRint).name()){ if(t.name() == typeid(LRint).name()){
LRint* lrint = static_cast<LRint*>(p.ptr()); LRint* lrint = static_cast<LRint*>(p.ptr());
return std::get<1>(lrint->l); if(lrint->is_lazy()){
return std::get<1>(lrint->l);
}
} }
} }
@ -482,6 +532,7 @@ public:
}; };
struct Less_xyz_3 : public BaseClass::Less_xyz_3 struct Less_xyz_3 : public BaseClass::Less_xyz_3
{ {
typedef typename Kernel_::Point_3 Point_3; typedef typename Kernel_::Point_3 Point_3;