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

Update Filtered_predicate_with_state not to rely on a 'result_type' typedef

This commit is contained in:
Mael Rouxel-Labbé 2025-01-08 17:20:44 +01:00
parent b8830caa24
commit 8c95fcca9c
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Filtered_kernel/include/CGAL/Filtered_predicate_with_state.h
View File

@ -33,33 +33,27 @@ class Filtered_predicate_with_state
O1 o1; O1 o1;
mutable boost::optional<EP> oep; mutable boost::optional<EP> oep;
AP ap; AP ap;
typedef typename AP::result_type Ares;
public: public:
// AP::result_type must be convertible to EP::result_type.
typedef AP Approximate_predicate; typedef AP Approximate_predicate;
typedef EP Exact_predicate; typedef EP Exact_predicate;
typedef C2E To_exact_converter; typedef C2E To_exact_converter;
typedef C2A To_approximate_converter; typedef C2A To_approximate_converter;
typedef typename EP::result_type result_type;
// AP::result_type must be convertible to EP::result_type.
Filtered_predicate_with_state(const O1 &o1) Filtered_predicate_with_state(const O1 &o1)
: c2e(), c2a(), o1(o1), oep(), ap(c2a(o1)) : c2e(), c2a(), o1(o1), oep(), ap(c2a(o1))
{} {}
template <typename... Args> template <typename... Args>
result_type auto
operator()(const Args&... args) const;
};
template <class EP, class AP, class C2E, class C2A, class O1, bool Protection>
template <typename... Args>
typename Filtered_predicate_with_state<EP,AP,C2E,C2A,O1,Protection>::result_type
Filtered_predicate_with_state<EP,AP,C2E,C2A,O1,Protection>::
operator()(const Args&... args) const operator()(const Args&... args) const
{ {
typedef typename Remove_needs_FT<CGAL::cpp20::remove_cvref_t<decltype((*oep)(c2e(args)...))> >::Type result_type;
#ifndef CGAL_EPICK_NO_INTERVALS
typedef typename Remove_needs_FT<CGAL::cpp20::remove_cvref_t<decltype(ap(c2a(args)...))> >::Type Ares;
CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp); CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp);
// Protection is outside the try block as VC8 has the CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG // Protection is outside the try block as VC8 has the CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG
{ {
@ -68,18 +62,22 @@ Filtered_predicate_with_state<EP,AP,C2E,C2A,O1,Protection>::
{ {
Ares res = ap(c2a(args)...); Ares res = ap(c2a(args)...);
if (is_certain(res)) if (is_certain(res))
return get_certain(res); return result_type(get_certain(res));
} }
catch (Uncertain_conversion_exception&) {} catch (Uncertain_conversion_exception&) {}
} }
CGAL_BRANCH_PROFILER_BRANCH(tmp); CGAL_BRANCH_PROFILER_BRANCH(tmp);
Protect_FPU_rounding<!Protection> p(CGAL_FE_TONEAREST); Protect_FPU_rounding<!Protection> p(CGAL_FE_TONEAREST);
CGAL_expensive_assertion(FPU_get_cw() == CGAL_FE_TONEAREST); CGAL_expensive_assertion(FPU_get_cw() == CGAL_FE_TONEAREST);
#endif
if(! oep){ if(! oep){
oep.emplace(c2e(o1)); oep.emplace(c2e(o1));
} }
return (*oep)(c2e(args)...); return result_type((*oep)(c2e(args)...));
} }
};
} //namespace CGAL } //namespace CGAL