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

Remove typedefs

This commit is contained in:
Andreas Fabri 2021-01-29 12:35:16 +00:00
parent 55e23ae840
commit 0cb34126af
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
STL_Extension/include/CGAL/function_objects.h
View File

@ -349,19 +349,16 @@ class Creator_uniform_d {
template < class Op1, class Op2 > template < class Op1, class Op2 >
class Unary_compose_1 class Unary_compose_1
: public CGAL::cpp98::unary_function< typename Op2::argument_type,
typename Op1::result_type >
{ {
protected: protected:
Op1 op1; Op1 op1;
Op2 op2; Op2 op2;
public: public:
typedef typename Op2::argument_type argument_type;
typedef typename Op1::result_type result_type;
Unary_compose_1(const Op1& x, const Op2& y) : op1(x), op2(y) {} Unary_compose_1(const Op1& x, const Op2& y) : op1(x), op2(y) {}
result_type template <typename argument_type>
decltype(auto)
operator()(const argument_type& x) const operator()(const argument_type& x) const
{ return op1(op2(x)); } { return op1(op2(x)); }
}; };
@ -373,21 +370,19 @@ compose1_1(const Op1& op1, const Op2& op2)
template < class Op1, class Op2, class Op3 > template < class Op1, class Op2, class Op3 >
class Binary_compose_1 class Binary_compose_1
: public CGAL::cpp98::unary_function< typename Op2::argument_type,
typename Op1::result_type >
{ {
protected: protected:
Op1 op1; Op1 op1;
Op2 op2; Op2 op2;
Op3 op3; Op3 op3;
public: public:
typedef typename Op2::argument_type argument_type;
typedef typename Op1::result_type result_type;
Binary_compose_1(const Op1& x, const Op2& y, const Op3& z) Binary_compose_1(const Op1& x, const Op2& y, const Op3& z)
: op1(x), op2(y), op3(z) {} : op1(x), op2(y), op3(z) {}
result_type template <typename argument_type>
decltype(auto)
operator()(const argument_type& x) const operator()(const argument_type& x) const
{ return op1(op2(x), op3(x)); } { return op1(op2(x), op3(x)); }
}; };
@ -399,21 +394,16 @@ compose2_1(const Op1& op1, const Op2& op2, const Op3& op3)
template < class Op1, class Op2 > template < class Op1, class Op2 >
class Unary_compose_2 class Unary_compose_2
: public CGAL::cpp98::binary_function< typename Op2::first_argument_type,
typename Op2::second_argument_type,
typename Op1::result_type >
{ {
protected: protected:
Op1 op1; Op1 op1;
Op2 op2; Op2 op2;
public: public:
typedef typename Op2::first_argument_type first_argument_type;
typedef typename Op2::second_argument_type second_argument_type;
typedef typename Op1::result_type result_type;
Unary_compose_2(const Op1& x, const Op2& y) : op1(x), op2(y) {} Unary_compose_2(const Op1& x, const Op2& y) : op1(x), op2(y) {}
result_type template <typename first_argument_type, typename second_argument_type>
decltype(auto)
operator()(const first_argument_type& x, operator()(const first_argument_type& x,
const second_argument_type& y) const const second_argument_type& y) const
{ return op1(op2(x, y)); } { return op1(op2(x, y)); }