Reindent and removal of duplicate typedef for Circle_2

This commit is contained in:
Andreas Fabri 2010-05-06 08:20:53 +00:00
parent a6c33fecf6
commit 83cb1edf06
1 changed files with 24 additions and 25 deletions

View File

@ -1268,37 +1268,36 @@ namespace CircularFunctors {
#endif
{
typedef typename CK::Circular_arc_2 Circular_arc_2;
typedef typename CK::Circle_2 Circle_2;
public:
#ifndef CGAL_CFG_MATCHING_BUG_6
typedef typename CK::Linear_kernel::Compute_squared_radius_2::result_type result_type;
typedef typename CK::Linear_kernel::Compute_squared_radius_2::result_type result_type;
using CK::Linear_kernel::Compute_squared_radius_2::operator();
#else
typedef typename CK::Linear_kernel LK;
typedef typename LK::Compute_squared_radius_2 LK_Compute_squared_radius_2;
typedef typename LK::FT FT;
typedef typename LK::Point_2 Point_2;
typedef typename LK::Circle_2 Circle_2;
public:
typedef FT result_type;
typedef typename LK::FT FT;
typedef typename LK::Point_2 Point_2;
typedef typename LK::Circle_2 Circle_2;
public:
typedef FT result_type;
const result_type&
operator()( const Circle_2& c) const
{ return LK_Compute_squared_radius_2()(c); }
const result_type&
operator()( const Circle_2& c) const
{ return LK_Compute_squared_radius_2()(c); }
result_type
operator()( const Point_2& p) const
{ return LK_Compute_squared_radius_2()(p); }
result_type
operator()( const Point_2& p) const
{ return LK_Compute_squared_radius_2()(p); }
result_type
operator()( const Point_2& p, const Point_2& q) const
{ return LK_Compute_squared_radius_2()(p, q); }
result_type
operator()( const Point_2& p, const Point_2& q) const
{ return LK_Compute_squared_radius_2()(p, q); }
result_type
operator()( const Point_2& p, const Point_2& q, const Point_2& r) const
{ return LK_Compute_squared_radius_2(p, q, r); }
result_type
operator()( const Point_2& p, const Point_2& q, const Point_2& r) const
{ return LK_Compute_squared_radius_2(p, q, r); }
#endif
@ -1306,7 +1305,7 @@ namespace CircularFunctors {
operator()(const Circular_arc_2& c) const
{ return c.rep().squared_radius(); }
};
};
} // namespace CircularFunctors