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

Replace all std::binary_function by CGAL::binary_function

This commit is contained in:
Laurent Rineau 2017-10-04 16:36:32 +02:00
parent 05a3370ad3
commit 2b35bddfb2
78 changed files with 303 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h
View File

@ -220,7 +220,7 @@ class Algebraic_structure_traits_base< Type_,
// Default implementation of Divides functor for unique factorization domains // Default implementation of Divides functor for unique factorization domains
// x divides y if gcd(y,x) equals x up to inverses // x divides y if gcd(y,x) equals x up to inverses
class Divides class Divides
: public std::binary_function<Type,Type,bool>{ : public CGAL::binary_function<Type,Type,bool>{
public: public:
bool operator()( const Type& x, const Type& y) const { bool operator()( const Type& x, const Type& y) const {
typedef CGAL::Algebraic_structure_traits<Type> AST; typedef CGAL::Algebraic_structure_traits<Type> AST;
@ -256,7 +256,7 @@ class Algebraic_structure_traits_base< Type_,
// maps to \c Div by default. // maps to \c Div by default.
class Integral_division class Integral_division
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( Type operator()(
@ -278,7 +278,7 @@ class Algebraic_structure_traits_base< Type_,
// Algorithm from NiX/euclids_algorithm.h // Algorithm from NiX/euclids_algorithm.h
class Gcd class Gcd
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( Type operator()(
@ -371,7 +371,7 @@ class Algebraic_structure_traits_base< Type_,
// based on \c Div_mod. // based on \c Div_mod.
class Div class Div
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -389,7 +389,7 @@ class Algebraic_structure_traits_base< Type_,
// based on \c Div_mod. // based on \c Div_mod.
class Mod class Mod
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -407,7 +407,7 @@ class Algebraic_structure_traits_base< Type_,
// Divides for Euclidean Ring // Divides for Euclidean Ring
class Divides class Divides
: public std::binary_function<Type, Type, bool>{ : public CGAL::binary_function<Type, Type, bool>{
public: public:
bool operator()( const Type& x, const Type& y) const { bool operator()( const Type& x, const Type& y) const {
typedef Algebraic_structure_traits<Type> AST; typedef Algebraic_structure_traits<Type> AST;
@ -455,7 +455,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
}; };
// maps to \c operator/ by default. // maps to \c operator/ by default.
class Integral_division class Integral_division
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -486,7 +486,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
// returns always true // returns always true
// \pre: x != 0 // \pre: x != 0
class Divides class Divides
: public std::binary_function< Type, Type, bool > { : public CGAL::binary_function< Type, Type, bool > {
public: public:
bool operator()( const Type& CGAL_precondition_code(x), const Type& /* y */) const { bool operator()( const Type& CGAL_precondition_code(x), const Type& /* y */) const {
CGAL_precondition_code( typedef Algebraic_structure_traits<Type> AST); CGAL_precondition_code( typedef Algebraic_structure_traits<Type> AST);
@ -522,7 +522,7 @@ class Algebraic_structure_traits_base< Type_,
typedef Field_with_sqrt_tag Algebraic_category; typedef Field_with_sqrt_tag Algebraic_category;
struct Is_square struct Is_square
:public std::binary_function<Type,Type&,bool> :public CGAL::binary_function<Type,Type&,bool>
{ {
bool operator()(const Type& ) const {return true;} bool operator()(const Type& ) const {return true;}
bool operator()( bool operator()(
@ -579,7 +579,7 @@ class Algebraic_structure_traits_base< Type_,
namespace INTERN_AST { namespace INTERN_AST {
template< class Type > template< class Type >
class Div_per_operator class Div_per_operator
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -592,7 +592,7 @@ namespace INTERN_AST {
template< class Type > template< class Type >
class Mod_per_operator class Mod_per_operator
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -605,7 +605,7 @@ namespace INTERN_AST {
template< class Type > template< class Type >
class Is_square_per_sqrt class Is_square_per_sqrt
: public std::binary_function< Type, Type&, : public CGAL::binary_function< Type, Type&,
bool > { bool > {
public: public:
bool operator()( const Type& x, bool operator()( const Type& x,

2
Algebraic_foundations/include/CGAL/Real_embeddable_traits.h
View File

@ -134,7 +134,7 @@ public:
//! The generic \c Compare functor implementation uses two comparisons. //! The generic \c Compare functor implementation uses two comparisons.
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
//! the function call. //! the function call.

2
Algebraic_foundations/include/CGAL/number_utils_classes.h
View File

@ -101,7 +101,7 @@ struct Is_zero :
namespace internal { namespace internal {
template <class NT, class Compare> struct Compare_base: public Compare {}; template <class NT, class Compare> struct Compare_base: public Compare {};
template <class NT> struct Compare_base<NT,Null_functor> template <class NT> struct Compare_base<NT,Null_functor>
:public std::binary_function< NT, NT, Comparison_result > { :public CGAL::binary_function< NT, NT, Comparison_result > {
Comparison_result operator()( const NT& x, const NT& y) const Comparison_result operator()( const NT& x, const NT& y) const
{ {
if (x < y) return SMALLER; if (x < y) return SMALLER;

38
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h
View File

@ -436,7 +436,7 @@ public:
* caching is used when appropriate * caching is used when appropriate
*/ */
class Construct_curve_pair_2 : class Construct_curve_pair_2 :
public std::binary_function<Curve_analysis_2, Curve_analysis_2, public CGAL::binary_function<Curve_analysis_2, Curve_analysis_2,
Curve_pair_analysis_2> { Curve_pair_analysis_2> {
public: public:
@ -669,7 +669,7 @@ public:
compute_polynomial_y_2_object); compute_polynomial_y_2_object);
class Isolate_x_2 : public std::binary_function<Algebraic_real_2, class Isolate_x_2 : public CGAL::binary_function<Algebraic_real_2,
Polynomial_1, Polynomial_1,
std::pair<Bound,Bound> > { std::pair<Bound,Bound> > {
@ -692,7 +692,7 @@ public:
CGAL_Algebraic_Kernel_cons(Isolate_x_2, CGAL_Algebraic_Kernel_cons(Isolate_x_2,
isolate_x_2_object); isolate_x_2_object);
class Isolate_y_2 : public std::binary_function<Algebraic_real_2, class Isolate_y_2 : public CGAL::binary_function<Algebraic_real_2,
Polynomial_1, Polynomial_1,
std::pair<Bound,Bound> > { std::pair<Bound,Bound> > {
@ -938,7 +938,7 @@ public:
#endif #endif
class Approximate_absolute_x_2 class Approximate_absolute_x_2
: public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{ : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
public: public:
@ -961,7 +961,7 @@ public:
approximate_absolute_x_2_object); approximate_absolute_x_2_object);
class Approximate_relative_x_2 class Approximate_relative_x_2
: public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{ : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
public: public:
@ -983,7 +983,7 @@ public:
approximate_relative_x_2_object); approximate_relative_x_2_object);
class Approximate_absolute_y_2 class Approximate_absolute_y_2
: public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{ : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
public: public:
@ -1013,7 +1013,7 @@ public:
approximate_absolute_y_2_object); approximate_absolute_y_2_object);
class Approximate_relative_y_2 class Approximate_relative_y_2
: public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{ : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
public: public:
@ -1164,8 +1164,8 @@ public:
//! \brief comparison of x-coordinates //! \brief comparison of x-coordinates
class Compare_x_2 : class Compare_x_2 :
public std::binary_function<Algebraic_real_2, Algebraic_real_2, public CGAL::binary_function<Algebraic_real_2, Algebraic_real_2,
Comparison_result > { Comparison_result > {
public: public:
@ -1257,7 +1257,7 @@ public:
* If possible, it is recommended to avoid this functor for efficiency.} * If possible, it is recommended to avoid this functor for efficiency.}
*/ */
class Compare_y_2 : class Compare_y_2 :
public std::binary_function< Algebraic_real_2, Algebraic_real_2, public CGAL::binary_function< Algebraic_real_2, Algebraic_real_2,
Comparison_result > { Comparison_result > {
public: public:
@ -1369,7 +1369,7 @@ public:
* to have equal x-coordinates, thus only the y-coordinates are compared. * to have equal x-coordinates, thus only the y-coordinates are compared.
*/ */
class Compare_xy_2 : class Compare_xy_2 :
public std::binary_function<Algebraic_real_2, Algebraic_real_2, public CGAL::binary_function<Algebraic_real_2, Algebraic_real_2,
Comparison_result > { Comparison_result > {
public: public:
@ -1529,7 +1529,7 @@ public:
* the two polynomials \c f and \c g are coprime. * the two polynomials \c f and \c g are coprime.
*/ */
class Has_finite_number_of_intersections_2 : class Has_finite_number_of_intersections_2 :
public std::binary_function< Polynomial_2, Polynomial_2, bool > { public CGAL::binary_function< Polynomial_2, Polynomial_2, bool > {
public: public:
@ -1800,7 +1800,7 @@ public:
* In pariticular, each singular point is x-critical. * In pariticular, each singular point is x-critical.
*/ */
class X_critical_points_2 : class X_critical_points_2 :
public std::binary_function< Curve_analysis_2, public CGAL::binary_function< Curve_analysis_2,
std::iterator<std::output_iterator_tag, Algebraic_real_2>, std::iterator<std::output_iterator_tag, Algebraic_real_2>,
std::iterator<std::output_iterator_tag, Algebraic_real_2> > { std::iterator<std::output_iterator_tag, Algebraic_real_2> > {
@ -1879,7 +1879,7 @@ public:
* In pariticular, each singular point is y-critical. * In pariticular, each singular point is y-critical.
*/ */
class Y_critical_points_2 : class Y_critical_points_2 :
public std::binary_function< Curve_analysis_2, public CGAL::binary_function< Curve_analysis_2,
std::iterator<std::output_iterator_tag, Algebraic_real_2>, std::iterator<std::output_iterator_tag, Algebraic_real_2>,
std::iterator<std::output_iterator_tag, Algebraic_real_2> > { std::iterator<std::output_iterator_tag, Algebraic_real_2> > {
@ -1974,7 +1974,7 @@ public:
// Overload the Sign_at_1 functor, to enable filter steps in the // Overload the Sign_at_1 functor, to enable filter steps in the
// Curve analysis in a coherent way // Curve analysis in a coherent way
class Sign_at_1 class Sign_at_1
: public::std::binary_function<Polynomial_1,Algebraic_real_1,Sign> { : public::CGAL::binary_function<Polynomial_1,Algebraic_real_1,Sign> {
public: public:
@ -2051,7 +2051,7 @@ public:
* curve. Returns a value convertible to \c CGAL::Sign * curve. Returns a value convertible to \c CGAL::Sign
*/ */
class Sign_at_2 : class Sign_at_2 :
public std::binary_function<Polynomial_2, Algebraic_real_2, Sign > { public CGAL::binary_function<Polynomial_2, Algebraic_real_2, Sign > {
public: public:
@ -2147,7 +2147,7 @@ public:
CGAL_Algebraic_Kernel_pred(Sign_at_2, sign_at_2_object); CGAL_Algebraic_Kernel_pred(Sign_at_2, sign_at_2_object);
class Is_zero_at_2 class Is_zero_at_2
: public std::binary_function<Polynomial_2,Algebraic_real_2,bool> { : public CGAL::binary_function<Polynomial_2,Algebraic_real_2,bool> {
public: public:
@ -2491,7 +2491,7 @@ public:
CGAL_Algebraic_Kernel_cons(Solve_2, solve_2_object); CGAL_Algebraic_Kernel_cons(Solve_2, solve_2_object);
class Number_of_solutions_2 class Number_of_solutions_2
: public std::binary_function<Polynomial_2,Polynomial_2,size_type> { : public CGAL::binary_function<Polynomial_2,Polynomial_2,size_type> {
public: public:
@ -2517,7 +2517,7 @@ public:
// Functor used to evaluate a Polynomial_2 in a Bound, up to a // Functor used to evaluate a Polynomial_2 in a Bound, up to a
// constant factor // constant factor
class Evaluate_utcf_2 class Evaluate_utcf_2
: public std::binary_function<Polynomial_2,Bound,Polynomial_1> { : public CGAL::binary_function<Polynomial_2,Bound,Polynomial_1> {
public: public:

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h
View File

@ -384,7 +384,7 @@ public:
typedef internal::Algebraic_real_d_1< Coefficient, Rational, HandlePolicy, RepClass > Type; typedef internal::Algebraic_real_d_1< Coefficient, Rational, HandlePolicy, RepClass > Type;
class Compare class Compare
: public std::binary_function< Type, Type, CGAL::Comparison_result > { : public CGAL::binary_function< Type, Type, CGAL::Comparison_result > {
public: public:
CGAL::Comparison_result operator()( const Type& a, const Type& b ) const CGAL::Comparison_result operator()( const Type& a, const Type& b ) const
{ return a.compare( b ); } { return a.compare( b ); }

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_analysis_2.h
View File

@ -111,7 +111,7 @@ template<typename Comparable>
}; };
template<typename Comparable> struct Compare_for_vert_line_map template<typename Comparable> struct Compare_for_vert_line_map
: public std::binary_function<Comparable,Comparable,bool> { : public CGAL::binary_function<Comparable,Comparable,bool> {
BOOST_MPL_HAS_XXX_TRAIT_DEF(T) BOOST_MPL_HAS_XXX_TRAIT_DEF(T)
BOOST_MPL_HAS_XXX_TRAIT_DEF(Handle_policy) BOOST_MPL_HAS_XXX_TRAIT_DEF(Handle_policy)

6
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h
View File

@ -80,7 +80,7 @@ public:
}; };
struct Mul_by_pow_of_2 struct Mul_by_pow_of_2
: public std::binary_function< leda_bigfloat, long, leda_bigfloat> { : public CGAL::binary_function< leda_bigfloat, long, leda_bigfloat> {
leda_bigfloat operator()( const leda_bigfloat& a, long e ) const { leda_bigfloat operator()( const leda_bigfloat& a, long e ) const {
return leda_bigfloat(a.get_significant(), a.get_exponent()+e); return leda_bigfloat(a.get_significant(), a.get_exponent()+e);
} }
@ -111,7 +111,7 @@ public:
}; };
struct Mul_by_pow_of_2 struct Mul_by_pow_of_2
: public std::binary_function : public CGAL::binary_function
< CORE::BigFloat, long , CORE::BigFloat> { < CORE::BigFloat, long , CORE::BigFloat> {
CORE::BigFloat operator()( const CORE::BigFloat& a, long e ) const { CORE::BigFloat operator()( const CORE::BigFloat& a, long e ) const {
return a*CORE::BigFloat::exp2(e); return a*CORE::BigFloat::exp2(e);
@ -148,7 +148,7 @@ public:
}; };
struct Mul_by_pow_of_2 struct Mul_by_pow_of_2
: public std::binary_function< Gmpfr, Gmpz, Gmpfr> { : public CGAL::binary_function< Gmpfr, Gmpz, Gmpfr> {
Gmpfr operator()( const Gmpfr& a, long e ) const { Gmpfr operator()( const Gmpfr& a, long e ) const {
Gmpfr result(0,a.get_precision()); // just to get the prec of a Gmpfr result(0,a.get_precision()); // just to get the prec of a
if (e >= 0 ){ if (e >= 0 ){

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h
View File

@ -38,7 +38,7 @@ namespace CGAL {
namespace internal { namespace internal {
template<typename Polynomial_1, typename Bound> template<typename Polynomial_1, typename Bound>
struct Interval_evaluate_1 : public std::binary_function struct Interval_evaluate_1 : public CGAL::binary_function
<Polynomial_1,std::pair<Bound,Bound>, <Polynomial_1,std::pair<Bound,Bound>,
std::pair<typename CGAL::Coercion_traits<typename std::pair<typename CGAL::Coercion_traits<typename
CGAL::Polynomial_traits_d<Polynomial_1>::Coefficient_type,Bound>::Type, CGAL::Polynomial_traits_d<Polynomial_1>::Coefficient_type,Bound>::Type,

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h
View File

@ -39,7 +39,7 @@ namespace CGAL {
namespace internal { namespace internal {
template<typename Polynomial_2, typename Bound> template<typename Polynomial_2, typename Bound>
struct Interval_evaluate_2 : public std::binary_function struct Interval_evaluate_2 : public CGAL::binary_function
<Polynomial_2,CGAL::cpp11::array<Bound,4>, <Polynomial_2,CGAL::cpp11::array<Bound,4>,
std::pair<typename CGAL::Coercion_traits<typename CGAL::Polynomial_traits_d<Polynomial_2>::Innermost_coefficient_type,Bound>::Type, std::pair<typename CGAL::Coercion_traits<typename CGAL::Polynomial_traits_d<Polynomial_2>::Innermost_coefficient_type,Bound>::Type,
typename CGAL::Coercion_traits<typename CGAL::Polynomial_traits_d<Polynomial_2>::Innermost_coefficient_type,Bound>::Type> > { typename CGAL::Coercion_traits<typename CGAL::Polynomial_traits_d<Polynomial_2>::Innermost_coefficient_type,Bound>::Type> > {

18
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_1.h
View File

@ -83,7 +83,7 @@ public:
typedef Algebraic_real_1 Type; typedef Algebraic_real_1 Type;
struct Bound_between struct Bound_between
: public std::binary_function< Type, Type, Bound > { : public CGAL::binary_function< Type, Type, Bound > {
Bound operator()( const Type& t1, Bound operator()( const Type& t1,
const Type& t2 ) const { const Type& t2 ) const {
#if CGAL_AK_DONT_USE_SIMPLE_BOUND_BETWEEN #if CGAL_AK_DONT_USE_SIMPLE_BOUND_BETWEEN
@ -148,7 +148,7 @@ public:
}; };
struct Approximate_absolute_1: struct Approximate_absolute_1:
public std::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{ public CGAL::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{
std::pair<Bound,Bound> std::pair<Bound,Bound>
operator()(const Algebraic_real_1& x, int prec) const { operator()(const Algebraic_real_1& x, int prec) const {
Lower_bound lower; Lower_bound lower;
@ -167,7 +167,7 @@ public:
}; };
struct Approximate_relative_1: struct Approximate_relative_1:
public std::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{ public CGAL::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{
std::pair<Bound,Bound> std::pair<Bound,Bound>
operator()(const Algebraic_real_1& x, int prec) const { operator()(const Algebraic_real_1& x, int prec) const {
@ -275,7 +275,7 @@ public:
/* /*
// TODO: Can we avoid to use this? // TODO: Can we avoid to use this?
struct Greater_compare : struct Greater_compare :
public std::binary_function<Algebraic_real_1,Algebraic_real_1,bool> { public CGAL::binary_function<Algebraic_real_1,Algebraic_real_1,bool> {
bool operator() (const Algebraic_real_1& a, const Algebraic_real_1& b) bool operator() (const Algebraic_real_1& a, const Algebraic_real_1& b)
const { const {
@ -349,7 +349,7 @@ public:
struct Sign_at_1 struct Sign_at_1
: public std::binary_function< Polynomial_1, Algebraic_real_1, CGAL::Sign > { : public CGAL::binary_function< Polynomial_1, Algebraic_real_1, CGAL::Sign > {
CGAL::Sign operator()( const Polynomial_1& p, const Algebraic_real_1& ar ) const { CGAL::Sign operator()( const Polynomial_1& p, const Algebraic_real_1& ar ) const {
if(CGAL::is_zero(p)) return ZERO; if(CGAL::is_zero(p)) return ZERO;
if(CGAL::degree(p)==0) return p.sign_at(0); if(CGAL::degree(p)==0) return p.sign_at(0);
@ -372,7 +372,7 @@ public:
} }
}; };
struct Is_zero_at_1 struct Is_zero_at_1
: public std::binary_function< Polynomial_1, Algebraic_real_1, bool > { : public CGAL::binary_function< Polynomial_1, Algebraic_real_1, bool > {
bool operator()( const Polynomial_1& p, const Algebraic_real_1& ar ) const { bool operator()( const Polynomial_1& p, const Algebraic_real_1& ar ) const {
if(CGAL::is_zero(p)) return true; if(CGAL::is_zero(p)) return true;
if( ar.low() == ar.high() ) return p.sign_at( ar.low() ) == ZERO; if( ar.low() == ar.high() ) return p.sign_at( ar.low() ) == ZERO;
@ -390,7 +390,7 @@ public:
}; };
struct Is_coprime_1 struct Is_coprime_1
: public std::binary_function< Polynomial_1, Polynomial_1, bool > { : public CGAL::binary_function< Polynomial_1, Polynomial_1, bool > {
bool operator()( const Polynomial_1& p1, const Polynomial_1& p2 ) const { bool operator()( const Polynomial_1& p1, const Polynomial_1& p2 ) const {
typename CGAL::Polynomial_traits_d< Polynomial_1 >::Total_degree total_degree; typename CGAL::Polynomial_traits_d< Polynomial_1 >::Total_degree total_degree;
@ -485,7 +485,7 @@ public:
}; };
struct Compare_1 struct Compare_1
: public std::binary_function<Algebraic_real_1, : public CGAL::binary_function<Algebraic_real_1,
Algebraic_real_1, Algebraic_real_1,
CGAL::Comparison_result>{ CGAL::Comparison_result>{
@ -530,7 +530,7 @@ public:
public: public:
struct Isolate_1 : public std::binary_function struct Isolate_1 : public CGAL::binary_function
< Algebraic_real_1,Polynomial_1,std::pair<Bound,Bound> > { < Algebraic_real_1,Polynomial_1,std::pair<Bound,Bound> > {
public: public:

16
Algebraic_kernel_d/include/CGAL/RS/functors_1.h
View File

@ -70,7 +70,7 @@ public CGAL::unary_function<Algebraic_,Polynomial_>{
template <class Polynomial_,class Ptraits_> template <class Polynomial_,class Ptraits_>
struct Is_coprime_1: struct Is_coprime_1:
public std::binary_function<Polynomial_,Polynomial_,bool>{ public CGAL::binary_function<Polynomial_,Polynomial_,bool>{
typedef Polynomial_ Polynomial; typedef Polynomial_ Polynomial;
typedef Ptraits_ Ptraits; typedef Ptraits_ Ptraits;
typedef typename Ptraits::Gcd_up_to_constant_factor Gcd; typedef typename Ptraits::Gcd_up_to_constant_factor Gcd;
@ -256,7 +256,7 @@ template <class Polynomial_,
class Signat_, class Signat_,
class Ptraits_> class Ptraits_>
class Sign_at_1: class Sign_at_1:
public std::binary_function<Polynomial_,Algebraic_,CGAL::Sign>{ public CGAL::binary_function<Polynomial_,Algebraic_,CGAL::Sign>{
// This implementation will work with any polynomial type whose // This implementation will work with any polynomial type whose
// coefficient type is explicit interoperable with Gmpfi. // coefficient type is explicit interoperable with Gmpfi.
// TODO: Make this function generic. // TODO: Make this function generic.
@ -362,7 +362,7 @@ template <class Polynomial_,
class Signat_, class Signat_,
class Ptraits_> class Ptraits_>
class Is_zero_at_1: class Is_zero_at_1:
public std::binary_function<Polynomial_,Algebraic_,bool>{ public CGAL::binary_function<Polynomial_,Algebraic_,bool>{
// This implementation will work with any polynomial type whose // This implementation will work with any polynomial type whose
// coefficient type is explicit interoperable with Gmpfi. // coefficient type is explicit interoperable with Gmpfi.
// TODO: Make this function generic. // TODO: Make this function generic.
@ -458,7 +458,7 @@ template <class Algebraic_,
class Bound_, class Bound_,
class Comparator_> class Comparator_>
struct Compare_1: struct Compare_1:
public std::binary_function<Algebraic_,Algebraic_,CGAL::Comparison_result>{ public CGAL::binary_function<Algebraic_,Algebraic_,CGAL::Comparison_result>{
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Comparator_ Comparator; typedef Comparator_ Comparator;
@ -510,7 +510,7 @@ template <class Algebraic_,
class Bound_, class Bound_,
class Comparator_> class Comparator_>
struct Bound_between_1: struct Bound_between_1:
public std::binary_function<Algebraic_,Algebraic_,Bound_>{ public CGAL::binary_function<Algebraic_,Algebraic_,Bound_>{
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Comparator_ Comparator; typedef Comparator_ Comparator;
@ -550,7 +550,7 @@ template <class Polynomial_,
class Signat_, class Signat_,
class Ptraits_> class Ptraits_>
struct Isolate_1: struct Isolate_1:
public std::binary_function<Algebraic_,Polynomial_,std::pair<Bound_,Bound_> >{ public CGAL::binary_function<Algebraic_,Polynomial_,std::pair<Bound_,Bound_> >{
typedef Polynomial_ Polynomial_1; typedef Polynomial_ Polynomial_1;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;
@ -588,7 +588,7 @@ template <class Polynomial_,
class Algebraic_, class Algebraic_,
class Refiner_> class Refiner_>
struct Approximate_absolute_1: struct Approximate_absolute_1:
public std::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{ public CGAL::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{
typedef Polynomial_ Polynomial_1; typedef Polynomial_ Polynomial_1;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;
@ -620,7 +620,7 @@ template <class Polynomial_,
class Algebraic_, class Algebraic_,
class Refiner_> class Refiner_>
struct Approximate_relative_1: struct Approximate_relative_1:
public std::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{ public CGAL::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{
typedef Polynomial_ Polynomial_1; typedef Polynomial_ Polynomial_1;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;

16
Algebraic_kernel_d/include/CGAL/RS/functors_z_1.h
View File

@ -78,7 +78,7 @@ public CGAL::unary_function<Algebraic_,Polynomial_>{
template <class Polynomial_,class Ptraits_> template <class Polynomial_,class Ptraits_>
struct Is_coprime_z_1: struct Is_coprime_z_1:
public std::binary_function<Polynomial_,Polynomial_,bool>{ public CGAL::binary_function<Polynomial_,Polynomial_,bool>{
typedef Polynomial_ Polynomial; typedef Polynomial_ Polynomial;
typedef Ptraits_ Ptraits; typedef Ptraits_ Ptraits;
typedef typename Ptraits::Gcd_up_to_constant_factor Gcd; typedef typename Ptraits::Gcd_up_to_constant_factor Gcd;
@ -284,7 +284,7 @@ template <class Polynomial_,
class Ptraits_, class Ptraits_,
class ZPtraits_> class ZPtraits_>
class Sign_at_z_1: class Sign_at_z_1:
public std::binary_function<Polynomial_,Algebraic_,CGAL::Sign>{ public CGAL::binary_function<Polynomial_,Algebraic_,CGAL::Sign>{
// This implementation will work with any polynomial type whose // This implementation will work with any polynomial type whose
// coefficient type is explicit interoperable with Gmpfi. // coefficient type is explicit interoperable with Gmpfi.
// TODO: Make this function generic. // TODO: Make this function generic.
@ -396,7 +396,7 @@ template <class Polynomial_,
class Ptraits_, class Ptraits_,
class ZPtraits_> class ZPtraits_>
class Is_zero_at_z_1: class Is_zero_at_z_1:
public std::binary_function<Polynomial_,Algebraic_,bool>{ public CGAL::binary_function<Polynomial_,Algebraic_,bool>{
// This implementation will work with any polynomial type whose // This implementation will work with any polynomial type whose
// coefficient type is explicit interoperable with Gmpfi. // coefficient type is explicit interoperable with Gmpfi.
// TODO: Make this function generic. // TODO: Make this function generic.
@ -500,7 +500,7 @@ template <class Algebraic_,
class Bound_, class Bound_,
class Comparator_> class Comparator_>
struct Compare_z_1: struct Compare_z_1:
public std::binary_function<Algebraic_,Algebraic_,CGAL::Comparison_result>{ public CGAL::binary_function<Algebraic_,Algebraic_,CGAL::Comparison_result>{
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Comparator_ Comparator; typedef Comparator_ Comparator;
@ -552,7 +552,7 @@ template <class Algebraic_,
class Bound_, class Bound_,
class Comparator_> class Comparator_>
struct Bound_between_z_1: struct Bound_between_z_1:
public std::binary_function<Algebraic_,Algebraic_,Bound_>{ public CGAL::binary_function<Algebraic_,Algebraic_,Bound_>{
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Comparator_ Comparator; typedef Comparator_ Comparator;
@ -595,7 +595,7 @@ template <class Polynomial_,
class Ptraits_, class Ptraits_,
class ZPtraits_> class ZPtraits_>
struct Isolate_z_1: struct Isolate_z_1:
public std::binary_function<Algebraic_,Polynomial_,std::pair<Bound_,Bound_> >{ public CGAL::binary_function<Algebraic_,Polynomial_,std::pair<Bound_,Bound_> >{
typedef Polynomial_ Polynomial_1; typedef Polynomial_ Polynomial_1;
typedef ZPolynomial_ ZPolynomial_1; typedef ZPolynomial_ ZPolynomial_1;
typedef PolConverter_ PolConverter; typedef PolConverter_ PolConverter;
@ -639,7 +639,7 @@ template <class Polynomial_,
class Algebraic_, class Algebraic_,
class Refiner_> class Refiner_>
struct Approximate_absolute_z_1: struct Approximate_absolute_z_1:
public std::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{ public CGAL::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{
typedef Polynomial_ Polynomial_1; typedef Polynomial_ Polynomial_1;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;
@ -671,7 +671,7 @@ template <class Polynomial_,
class Algebraic_, class Algebraic_,
class Refiner_> class Refiner_>
struct Approximate_relative_z_1: struct Approximate_relative_z_1:
public std::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{ public CGAL::binary_function<Algebraic_,int,std::pair<Bound_,Bound_> >{
typedef Polynomial_ Polynomial_1; typedef Polynomial_ Polynomial_1;
typedef Bound_ Bound; typedef Bound_ Bound;
typedef Algebraic_ Algebraic; typedef Algebraic_ Algebraic;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_predicates.h
View File

@ -70,7 +70,7 @@ struct Td_active_edge_item:
}; };
template <class _Tp> template <class _Tp>
struct Td_map_item_handle_less : public std::binary_function<_Tp, _Tp, bool> struct Td_map_item_handle_less : public CGAL::binary_function<_Tp, _Tp, bool>
{ {
bool operator()(const _Tp& __x, const _Tp& __y) const { bool operator()(const _Tp& __x, const _Tp& __y) const {
return __x->id() < __y->id(); } return __x->id() < __y->id(); }

2
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h
View File

@ -58,7 +58,7 @@ template < class CurvedKernelViaAnalysis_2,
class ConstructArc_2 = class ConstructArc_2 =
typename CurvedKernelViaAnalysis_2::Construct_arc_2 > typename CurvedKernelViaAnalysis_2::Construct_arc_2 >
struct Make_x_monotone_2 : struct Make_x_monotone_2 :
public std::binary_function< typename CurvedKernelViaAnalysis_2::Curve_2, public CGAL::binary_function< typename CurvedKernelViaAnalysis_2::Curve_2,
std::iterator<std::output_iterator_tag, CGAL::Object>, std::iterator<std::output_iterator_tag, CGAL::Object>,
std::iterator<std::output_iterator_tag, CGAL::Object> > { std::iterator<std::output_iterator_tag, CGAL::Object> > {

12
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h
View File

@ -1062,7 +1062,7 @@ public:
* caching is used when appropriate * caching is used when appropriate
*/ */
struct Construct_curve_pair_2 : struct Construct_curve_pair_2 :
public std::binary_function<Curve_analysis_2, Curve_analysis_2, public CGAL::binary_function<Curve_analysis_2, Curve_analysis_2,
Curve_pair_analysis_2> { Curve_pair_analysis_2> {
Curve_pair_analysis_2 operator() Curve_pair_analysis_2 operator()
@ -1198,7 +1198,7 @@ public:
//! \brief comparison of x-coordinates //! \brief comparison of x-coordinates
struct Compare_x_2 : struct Compare_x_2 :
public std::binary_function<Algebraic_real_1, Algebraic_real_1, public CGAL::binary_function<Algebraic_real_1, Algebraic_real_1,
Comparison_result > { Comparison_result > {
Comparison_result operator()(const Algebraic_real_1& x1, Comparison_result operator()(const Algebraic_real_1& x1,
@ -1214,7 +1214,7 @@ public:
//! \brief comparison of y-coordinates of two points //! \brief comparison of y-coordinates of two points
struct Compare_y_2 : struct Compare_y_2 :
public std::binary_function< Xy_coordinate_2, Xy_coordinate_2, public CGAL::binary_function< Xy_coordinate_2, Xy_coordinate_2,
Comparison_result > { Comparison_result > {
Comparison_result operator()(const Xy_coordinate_2& xy1, Comparison_result operator()(const Xy_coordinate_2& xy1,
@ -1228,7 +1228,7 @@ public:
//! //!
//! \c equal_x specifies that only y-coordinates need to be compared //! \c equal_x specifies that only y-coordinates need to be compared
struct Compare_xy_2 : struct Compare_xy_2 :
public std::binary_function<Xy_coordinate_2, Xy_coordinate_2, public CGAL::binary_function<Xy_coordinate_2, Xy_coordinate_2,
Comparison_result > Comparison_result >
{ {
Comparison_result operator()(const Xy_coordinate_2& xy1, Comparison_result operator()(const Xy_coordinate_2& xy1,
@ -1260,7 +1260,7 @@ public:
//! in case of algerbaic curves: checks whether supporting polynomials are //! in case of algerbaic curves: checks whether supporting polynomials are
//! coprime //! coprime
struct Has_finite_number_of_intersections_2 : struct Has_finite_number_of_intersections_2 :
public std::binary_function< Curve_analysis_2, Curve_analysis_2, bool > { public CGAL::binary_function< Curve_analysis_2, Curve_analysis_2, bool > {
bool operator()(const Curve_analysis_2& c1, bool operator()(const Curve_analysis_2& c1,
const Curve_analysis_2& c2) const { const Curve_analysis_2& c2) const {
@ -1376,7 +1376,7 @@ public:
* returns a value convertible to \c CGAL::Sign * returns a value convertible to \c CGAL::Sign
*/ */
struct Sign_at_2 : struct Sign_at_2 :
public std::binary_function< Polynomial_2, Xy_coordinate_2, Sign > { public CGAL::binary_function< Polynomial_2, Xy_coordinate_2, Sign > {
Sign operator()(const Polynomial_2& p, const Xy_coordinate_2& r) const Sign operator()(const Polynomial_2& p, const Xy_coordinate_2& r) const
{ {

6
Bounding_volumes/include/CGAL/Min_quadrilateral_traits_2.h
View File

@ -128,7 +128,7 @@ public:
// new predicates // new predicates
struct Area_less_rectangle_2 struct Area_less_rectangle_2
: public std::binary_function< Rectangle_2, Rectangle_2, bool > : public CGAL::binary_function< Rectangle_2, Rectangle_2, bool >
{ {
RT RT
area_numerator(const Rectangle_2& r, Cartesian_tag) const area_numerator(const Rectangle_2& r, Cartesian_tag) const
@ -169,7 +169,7 @@ public:
} }
}; };
struct Area_less_parallelogram_2 struct Area_less_parallelogram_2
: public std::binary_function< Parallelogram_2, : public CGAL::binary_function< Parallelogram_2,
Parallelogram_2, Parallelogram_2,
bool > bool >
{ {
@ -214,7 +214,7 @@ public:
} }
}; };
struct Width_less_strip_2 struct Width_less_strip_2
: public std::binary_function< Strip_2, Strip_2, bool > : public CGAL::binary_function< Strip_2, Strip_2, bool >
{ {
RT RT
width_numerator(const Strip_2& r, Cartesian_tag) const width_numerator(const Strip_2& r, Cartesian_tag) const

10
Bounding_volumes/include/CGAL/Rectangular_p_center_traits_2.h
View File

@ -33,7 +33,7 @@
namespace CGAL { namespace CGAL {
template < class A, class S > template < class A, class S >
struct Select : public std::binary_function< A, A, A > { struct Select : public CGAL::binary_function< A, A, A > {
Select() {} Select() {}
Select(const S& s) : s_(s) {} Select(const S& s) : s_(s) {}
A operator()(const A& a, const A& b) const A operator()(const A& a, const A& b) const
@ -46,7 +46,7 @@ protected:
template < class R > template < class R >
struct I_Signed_x_distance_2 struct I_Signed_x_distance_2
: public std::binary_function< : public CGAL::binary_function<
Point_2< R >, Point_2< R >, typename R::FT > Point_2< R >, Point_2< R >, typename R::FT >
{ {
typename R::FT typename R::FT
@ -55,7 +55,7 @@ struct I_Signed_x_distance_2
}; };
template < class R > template < class R >
struct I_Signed_y_distance_2 struct I_Signed_y_distance_2
: public std::binary_function< : public CGAL::binary_function<
Point_2< R >, Point_2< R >, typename R::FT > Point_2< R >, Point_2< R >, typename R::FT >
{ {
typename R::FT typename R::FT
@ -64,7 +64,7 @@ struct I_Signed_y_distance_2
}; };
template < class R > template < class R >
struct I_Infinity_distance_2 struct I_Infinity_distance_2
: public std::binary_function< : public CGAL::binary_function<
Point_2< R >, Point_2< R >, typename R::FT > Point_2< R >, Point_2< R >, typename R::FT >
{ {
typename R::FT typename R::FT
@ -76,7 +76,7 @@ struct I_Infinity_distance_2
template < class R > template < class R >
struct I_Signed_infinity_distance_2 struct I_Signed_infinity_distance_2
: public std::binary_function< : public CGAL::binary_function<
Point_2< R >, Point_2< R >, typename R::FT > Point_2< R >, Point_2< R >, typename R::FT >
{ {
typename R::FT typename R::FT

2
Bounding_volumes/include/CGAL/min_quadrilateral_2.h
View File

@ -295,7 +295,7 @@ namespace Optimisation {
template < class Kernel > template < class Kernel >
class Rdbmop class Rdbmop
: public std::binary_function< Direction_2, int, Direction_2 > : public CGAL::binary_function< Direction_2, int, Direction_2 >
{ {
typename Kernel::Construct_perpendicular_vector_2 cperpvec; typename Kernel::Construct_perpendicular_vector_2 cperpvec;
typename Kernel::Construct_vector_from_direction_2 cvec; typename Kernel::Construct_vector_from_direction_2 cvec;

22
Bounding_volumes/test/Bounding_volumes/minimum_enclosing_quadrilateral_2_test_traits.cpp
View File

@ -39,19 +39,19 @@ struct MyTraits {
}; };
struct Strip_2 { Point_2 pp1, pp2; Direction_2 dd; }; struct Strip_2 { Point_2 pp1, pp2; Direction_2 dd; };
struct Equal_2 struct Equal_2
: public std::binary_function<Point_2,Point_2,bool> : public CGAL::binary_function<Point_2,Point_2,bool>
{ {
bool operator()(const Point_2& p, const Point_2& q) const bool operator()(const Point_2& p, const Point_2& q) const
{ return p.xc == q.xc && p.yc == q.yc; } { return p.xc == q.xc && p.yc == q.yc; }
}; };
struct Less_xy_2 struct Less_xy_2
: public std::binary_function<Point_2,Point_2,bool> : public CGAL::binary_function<Point_2,Point_2,bool>
{ {
bool operator()(const Point_2& p, const Point_2& q) const bool operator()(const Point_2& p, const Point_2& q) const
{ return p.xc < q.xc || (p.xc == q.xc && p.yc < q.yc); } { return p.xc < q.xc || (p.xc == q.xc && p.yc < q.yc); }
}; };
struct Less_yx_2 struct Less_yx_2
: public std::binary_function<Point_2,Point_2,bool> : public CGAL::binary_function<Point_2,Point_2,bool>
{ {
bool operator()(const Point_2& p, const Point_2& q) const bool operator()(const Point_2& p, const Point_2& q) const
{ return p.yc < q.yc || (p.yc == q.yc && p.xc < q.xc); } { return p.yc < q.yc || (p.yc == q.yc && p.xc < q.xc); }
@ -65,7 +65,7 @@ struct MyTraits {
} }
}; };
struct Has_on_negative_side_2 struct Has_on_negative_side_2
: public std::binary_function<Line_2,Point_2,bool> : public CGAL::binary_function<Line_2,Point_2,bool>
{ {
bool operator()(const Line_2& l, const Point_2& p) const { bool operator()(const Line_2& l, const Point_2& p) const {
return return
@ -75,14 +75,14 @@ struct MyTraits {
} }
}; };
struct Compare_angle_with_x_axis_2 struct Compare_angle_with_x_axis_2
: public std::binary_function<Direction_2,Direction_2,CGAL::Comparison_result> : public CGAL::binary_function<Direction_2,Direction_2,CGAL::Comparison_result>
{ {
CGAL::Comparison_result CGAL::Comparison_result
operator()(const Direction_2& d, const Direction_2& e) const operator()(const Direction_2& d, const Direction_2& e) const
{ return CGAL::compare_angle_with_x_axisC2(d.xd, d.yd, e.xd, e.yd); } { return CGAL::compare_angle_with_x_axisC2(d.xd, d.yd, e.xd, e.yd); }
}; };
struct Area_less_rectangle_2 struct Area_less_rectangle_2
: public std::binary_function<Rectangle_2,Rectangle_2,bool> : public CGAL::binary_function<Rectangle_2,Rectangle_2,bool>
{ {
bool operator()(const Rectangle_2& d, const Rectangle_2& e) const bool operator()(const Rectangle_2& d, const Rectangle_2& e) const
{ {
@ -101,7 +101,7 @@ struct MyTraits {
} }
}; };
struct Area_less_parallelogram_2 struct Area_less_parallelogram_2
: public std::binary_function<Parallelogram_2,Parallelogram_2,bool> : public CGAL::binary_function<Parallelogram_2,Parallelogram_2,bool>
{ {
bool operator()(const Parallelogram_2& d, bool operator()(const Parallelogram_2& d,
const Parallelogram_2& e) const const Parallelogram_2& e) const
@ -120,7 +120,7 @@ struct MyTraits {
} }
}; };
struct Width_less_strip_2 struct Width_less_strip_2
: public std::binary_function<Strip_2,Strip_2,bool> : public CGAL::binary_function<Strip_2,Strip_2,bool>
{ {
bool operator()(const Strip_2& d, const Strip_2& e) const bool operator()(const Strip_2& d, const Strip_2& e) const
{ {
@ -133,7 +133,7 @@ struct MyTraits {
} }
}; };
struct Construct_vector_2 struct Construct_vector_2
: public std::binary_function<Point_2,Point_2,Vector_2> : public CGAL::binary_function<Point_2,Point_2,Vector_2>
{ {
Vector_2 operator()(const Point_2& p, const Point_2& q) const Vector_2 operator()(const Point_2& p, const Point_2& q) const
{ {
@ -155,7 +155,7 @@ struct MyTraits {
} }
}; };
struct Construct_perpendicular_vector_2 struct Construct_perpendicular_vector_2
: public std::binary_function<Vector_2,CGAL::Orientation,Vector_2> : public CGAL::binary_function<Vector_2,CGAL::Orientation,Vector_2>
{ {
Vector_2 operator()(const Vector_2& v, CGAL::Orientation o) const Vector_2 operator()(const Vector_2& v, CGAL::Orientation o) const
{ {
@ -193,7 +193,7 @@ struct MyTraits {
} }
}; };
struct Construct_line_2 struct Construct_line_2
: public std::binary_function<Point_2,Direction_2,Line_2> : public CGAL::binary_function<Point_2,Direction_2,Line_2>
{ {
Line_2 operator()(const Point_2& p, const Direction_2& d) const Line_2 operator()(const Point_2& p, const Direction_2& d) const
{ {

2
Box_intersection_d/include/CGAL/Box_intersection_d/Box_traits_d.h
View File

@ -91,7 +91,7 @@ struct Predicate_traits_d : public BoxTraits {
// compare dim a b = islolesslo a b dim // compare dim a b = islolesslo a b dim
class Compare : class Compare :
public std::binary_function<Box_parameter,Box_parameter,bool> public CGAL::binary_function<Box_parameter,Box_parameter,bool>
{ {
int dim; int dim;
public: public:

2
Cone_spanners_2/include/CGAL/Cone_spanners_2/Less_by_direction_2.h
View File

@ -57,7 +57,7 @@ namespace CGAL {
* *
*/ */
template <typename Kernel_, typename Graph_> template <typename Kernel_, typename Graph_>
class Less_by_direction_2 : public std::binary_function <typename Graph_::vertex_descriptor, class Less_by_direction_2 : public CGAL::binary_function <typename Graph_::vertex_descriptor,
typename Graph_::vertex_descriptor, bool> { typename Graph_::vertex_descriptor, bool> {
public: public:

6
Generator/doc/Generator/CGAL/Random_convex_set_traits_2.h
View File

@ -27,14 +27,14 @@ typedef Kernel::FT FT;
/*! /*!
function object class derived from function object class derived from
`std::binary_function<Point_2, Point_2, Point_2>` `CGAL::binary_function<Point_2, Point_2, Point_2>`
*/ */
typedef unspecified_type Sum; typedef unspecified_type Sum;
/*! /*!
function object class derived from function object class derived from
`std::binary_function<Point_2, Point_2, Point_2>` `CGAL::binary_function<Point_2, Point_2, Point_2>`
*/ */
typedef unspecified_type Scale; typedef unspecified_type Scale;
@ -46,7 +46,7 @@ typedef unspecified_type Max_coordinate;
/*! /*!
function object class derived from function object class derived from
`std::binary_function<Point_2, Point_2, bool>` `CGAL::binary_function<Point_2, Point_2, bool>`
*/ */
typedef unspecified_type Angle_less; typedef unspecified_type Angle_less;

6
Generator/include/CGAL/Random_convex_set_traits_2.h
View File

@ -55,7 +55,7 @@ struct Random_convex_set_traits_2 : public Kernel {
}; };
struct Sum struct Sum
: public std::binary_function< Point_2, Point_2, Point_2 > : public CGAL::binary_function< Point_2, Point_2, Point_2 >
{ {
Point_2 Point_2
operator()( const Point_2& p, const Point_2& q) const operator()( const Point_2& p, const Point_2& q) const
@ -63,7 +63,7 @@ struct Random_convex_set_traits_2 : public Kernel {
}; };
struct Scale struct Scale
: public std::binary_function< Point_2, FT, Point_2 > : public CGAL::binary_function< Point_2, FT, Point_2 >
{ {
Point_2 Point_2
operator()( const Point_2& p, const FT& k) const operator()( const Point_2& p, const FT& k) const
@ -71,7 +71,7 @@ struct Random_convex_set_traits_2 : public Kernel {
}; };
struct Angle_less struct Angle_less
: public std::binary_function< Point_2, Point_2, bool > : public CGAL::binary_function< Point_2, Point_2, bool >
{ {
bool bool
operator()( const Point_2& p, const Point_2& q) const operator()( const Point_2& p, const Point_2& q) const

2
Inscribed_areas/include/CGAL/extremal_polygon_2.h
View File

@ -40,7 +40,7 @@ namespace CGAL {
//!!! This will eventually be integrated into function_objects.h //!!! This will eventually be integrated into function_objects.h
template < class Array, class Index, class Element > template < class Array, class Index, class Element >
struct Index_operator struct Index_operator
: public std::binary_function< Array, Index, Element > : public CGAL::binary_function< Array, Index, Element >
{ {
Element& Element&
operator()( Array& a, const Index& i) const operator()( Array& a, const Index& i) const

2
Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h
View File

@ -663,7 +663,7 @@ public:
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

2
Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h
View File

@ -968,7 +968,7 @@ public:
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

2
Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
View File

@ -276,7 +276,7 @@ template <class A, class B> \
}; \ }; \
\ \
class Compare \ class Compare \
: public std::binary_function< Type, Type, \ : public CGAL::binary_function< Type, Type, \
Comparison_result > { \ Comparison_result > { \
public: \ public: \
Comparison_result operator()( const Type& x, \ Comparison_result operator()( const Type& x, \

6
Nef_2/include/CGAL/Nef_polynomial.h
View File

@ -145,7 +145,7 @@ public:
typedef typename AST_NT::Is_exact Is_exact; typedef typename AST_NT::Is_exact Is_exact;
typedef Tag_false Is_numerical_sensitive; typedef Tag_false Is_numerical_sensitive;
class Integral_division class Integral_division
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -157,7 +157,7 @@ public:
}; };
class Gcd class Gcd
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
public: public:
Type operator()( const Type& x, const Type& y ) const { Type operator()( const Type& x, const Type& y ) const {
// By definition gcd(0,0) == 0 // By definition gcd(0,0) == 0
@ -191,7 +191,7 @@ template <class NT> class Real_embeddable_traits< Nef_polynomial<NT> >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
CGAL::Comparison_result > { CGAL::Comparison_result > {
public: public:
CGAL::Comparison_result inline operator()( CGAL::Comparison_result inline operator()(

2
NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h
View File

@ -103,7 +103,7 @@ template<class R_> struct Point_of_sphere : private Store_kernel<R_> {
typedef Point result_type; typedef Point result_type;
typedef Sphere first_argument_type; typedef Sphere first_argument_type;
typedef int second_argument_type; typedef int second_argument_type;
struct Trans : std::binary_function<FT,int,FT> { struct Trans : CGAL::binary_function<FT,int,FT> {
FT const& r_; int idx; bool sgn; FT const& r_; int idx; bool sgn;
Trans (int n, FT const& r, bool b) : r_(r), idx(n), sgn(b) {} Trans (int n, FT const& r, bool b) : r_(r), idx(n), sgn(b) {}
FT operator()(FT const&x, int i)const{ FT operator()(FT const&x, int i)const{

4
NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
View File

@ -1032,7 +1032,7 @@ template<class R_> struct Midpoint : private Store_kernel<R_> {
typedef Point first_argument_type; typedef Point first_argument_type;
typedef Point second_argument_type; typedef Point second_argument_type;
// There is a division, but it will be cast to RT afterwards anyway, so maybe we could use RT. // There is a division, but it will be cast to RT afterwards anyway, so maybe we could use RT.
struct Average : std::binary_function<FT,RT,FT> { struct Average : CGAL::binary_function<FT,RT,FT> {
FT operator()(FT const&a, RT const&b)const{ FT operator()(FT const&a, RT const&b)const{
return (a+b)/2; return (a+b)/2;
} }
@ -1098,7 +1098,7 @@ template<class R_> struct Squared_distance : private Store_kernel<R_> {
typedef RT result_type; typedef RT result_type;
typedef Point first_argument_type; typedef Point first_argument_type;
typedef Point second_argument_type; typedef Point second_argument_type;
struct Sq_diff : std::binary_function<RT,RT,RT> { struct Sq_diff : CGAL::binary_function<RT,RT,RT> {
RT operator()(RT const&a, RT const&b)const{ RT operator()(RT const&a, RT const&b)const{
return CGAL::square(a-b); return CGAL::square(a-b);
} }

20
Number_types/include/CGAL/CORE_BigFloat.h
View File

@ -89,32 +89,32 @@ public:
} }
}; };
struct In :public std::binary_function<Bound,Interval,bool>{ struct In :public CGAL::binary_function<Bound,Interval,bool>{
bool operator()( Bound x, const Interval& a ) const { bool operator()( Bound x, const Interval& a ) const {
CGAL_precondition(CGAL::singleton(x)); CGAL_precondition(CGAL::singleton(x));
return (Lower()(a) <= x && x <= Upper()(a)); return (Lower()(a) <= x && x <= Upper()(a));
} }
}; };
struct Equal :public std::binary_function<Interval,Interval,bool>{ struct Equal :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return (Upper()(a) == Upper()(b) && Lower()(a) == Lower()(b)); return (Upper()(a) == Upper()(b) && Lower()(a) == Lower()(b));
} }
}; };
struct Subset :public std::binary_function<Interval,Interval,bool>{ struct Subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return Lower()(b) <= Lower()(a) && Upper()(a) <= Upper()(b); return Lower()(b) <= Lower()(a) && Upper()(a) <= Upper()(b);
} }
}; };
struct Proper_subset :public std::binary_function<Interval,Interval,bool>{ struct Proper_subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return Subset()(a,b) && (!Equal()(a,b)); return Subset()(a,b) && (!Equal()(a,b));
} }
}; };
struct Intersection :public std::binary_function<Interval,Interval,Interval>{ struct Intersection :public CGAL::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const { Interval operator()( const Interval& a, const Interval& b ) const {
BOOST_USING_STD_MAX(); BOOST_USING_STD_MAX();
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();
@ -128,7 +128,7 @@ public:
}; };
struct Overlap :public std::binary_function<Interval,Interval,bool>{ struct Overlap :public CGAL::binary_function<Interval,Interval,bool>{
bool operator() ( Interval x, Interval y ) const { bool operator() ( Interval x, Interval y ) const {
Self::Zero_in Zero_in; Self::Zero_in Zero_in;
bool result = Zero_in(x-y); bool result = Zero_in(x-y);
@ -136,7 +136,7 @@ public:
} }
}; };
struct Hull :public std::binary_function<Interval,Interval,Interval>{ struct Hull :public CGAL::binary_function<Interval,Interval,Interval>{
// for debugging // for debugging
/* void print_bf(CORE::BigFloat bf, std::string s) const { /* void print_bf(CORE::BigFloat bf, std::string s) const {
@ -234,7 +234,7 @@ public:
} }
}; };
struct Construct :public std::binary_function<Bound,Bound,Interval>{ struct Construct :public CGAL::binary_function<Bound,Bound,Interval>{
Interval operator()( const Bound& l,const Bound& r) const { Interval operator()( const Bound& l,const Bound& r) const {
CGAL_precondition( l < r ); CGAL_precondition( l < r );
return Hull()(l,r); return Hull()(l,r);
@ -405,7 +405,7 @@ template <> class Algebraic_structure_traits< CORE::BigFloat >
}; };
class Kth_root class Kth_root
: public std::binary_function<int, Type, Type> { : public CGAL::binary_function<int, Type, Type> {
public: public:
Type operator()( int k, Type operator()( int k,
const Type& x) const { const Type& x) const {
@ -470,7 +470,7 @@ template <> class Real_embeddable_traits< CORE::BigFloat >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

4
Number_types/include/CGAL/CORE_BigInt.h
View File

@ -62,7 +62,7 @@ template <> class Algebraic_structure_traits< CORE::BigInt >
class Gcd class Gcd
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -101,7 +101,7 @@ template <> class Real_embeddable_traits< CORE::BigInt >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

2
Number_types/include/CGAL/CORE_BigRat.h
View File

@ -80,7 +80,7 @@ template <> class Real_embeddable_traits< CORE::BigRat >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

4
Number_types/include/CGAL/CORE_Expr.h
View File

@ -49,7 +49,7 @@ template <> class Algebraic_structure_traits< CORE::Expr >
}; };
class Kth_root class Kth_root
: public std::binary_function<int, Type, Type> { : public CGAL::binary_function<int, Type, Type> {
public: public:
Type operator()( int k, Type operator()( int k,
const Type& x) const { const Type& x) const {
@ -144,7 +144,7 @@ template <> class Real_embeddable_traits< CORE::Expr >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

12
Number_types/include/CGAL/Counted_number.h
View File

@ -584,7 +584,7 @@ struct Square_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Integral_division_selector { struct Integral_division_selector {
struct Integral_division : public std::binary_function<NT, NT, NT > { struct Integral_division : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
return x.integral_division( y ); return x.integral_division( y );
} }
@ -598,7 +598,7 @@ struct Integral_division_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Is_square_selector { struct Is_square_selector {
struct Is_square : public std::binary_function<NT, NT&, bool > { struct Is_square : public CGAL::binary_function<NT, NT&, bool > {
bool operator()( const NT& x, NT& y ) const { bool operator()( const NT& x, NT& y ) const {
return x.is_square( y ); return x.is_square( y );
} }
@ -630,7 +630,7 @@ struct Sqrt_selector<NT,Null_functor> {
template< class NT, class Functor > template< class NT, class Functor >
struct Kth_root_selector { struct Kth_root_selector {
struct Kth_root : public std::binary_function<int, NT, NT > { struct Kth_root : public CGAL::binary_function<int, NT, NT > {
NT operator()( int k, const NT& x ) const { NT operator()( int k, const NT& x ) const {
return x.kth_root( k ); return x.kth_root( k );
} }
@ -686,7 +686,7 @@ struct Root_of_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Gcd_selector { struct Gcd_selector {
struct Gcd : public std::binary_function<NT, NT, NT > { struct Gcd : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
return x.gcd( y ); return x.gcd( y );
} }
@ -700,7 +700,7 @@ struct Gcd_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Div_selector { struct Div_selector {
struct Div : public std::binary_function<NT, NT, NT > { struct Div : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
return x.div( y ); return x.div( y );
} }
@ -714,7 +714,7 @@ struct Div_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Mod_selector { struct Mod_selector {
struct Mod : public std::binary_function<NT, NT, NT > { struct Mod : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
return x.mod( y ); return x.mod( y );
} }

24
Number_types/include/CGAL/Gmpfi.h
View File

@ -62,7 +62,7 @@ public:
}; };
struct Is_square: struct Is_square:
public std::binary_function<Type,Type&,Boolean>{ public CGAL::binary_function<Type,Type&,Boolean>{
Boolean operator()(const Type &x)const{ Boolean operator()(const Type &x)const{
return x.is_square(); return x.is_square();
}; };
@ -79,14 +79,14 @@ public:
}; };
struct Kth_Root: struct Kth_Root:
public std::binary_function<int,Type,Type>{ public CGAL::binary_function<int,Type,Type>{
Type operator()(int k,const Type &x)const{ Type operator()(int k,const Type &x)const{
return (k==3?x.cbrt():x.kthroot(k)); return (k==3?x.cbrt():x.kthroot(k));
}; };
}; };
struct Divides: struct Divides:
public std::binary_function<Type,Type,Boolean>{ public CGAL::binary_function<Type,Type,Boolean>{
Boolean operator()(const Type &d,const Type &n)const{ Boolean operator()(const Type &d,const Type &n)const{
// Avoid compiler warning // Avoid compiler warning
(void)n; (void)n;
@ -149,7 +149,7 @@ public INTERN_RET::Real_embeddable_traits_base<Gmpfi,CGAL::Tag_true>{
}; };
struct Compare: struct Compare:
public std::binary_function<Type,Type,Comparison_result>{ public CGAL::binary_function<Type,Type,Comparison_result>{
inline Comparison_result operator() inline Comparison_result operator()
(const Type &x,const Type &y)const{ (const Type &x,const Type &y)const{
return x.compare(y); return x.compare(y);
@ -184,7 +184,7 @@ public:
typedef CGAL::Tag_false With_empty_interval; typedef CGAL::Tag_false With_empty_interval;
typedef CGAL::Tag_true Is_interval; typedef CGAL::Tag_true Is_interval;
struct Construct :public std::binary_function<Bound,Bound,Interval>{ struct Construct :public CGAL::binary_function<Bound,Bound,Interval>{
Interval operator()( const Bound& l,const Bound& r) const { Interval operator()( const Bound& l,const Bound& r) const {
CGAL_precondition( l < r ); CGAL_precondition( l < r );
return Interval(std::make_pair(l,r)); return Interval(std::make_pair(l,r));
@ -233,37 +233,37 @@ public:
} }
}; };
struct In :public std::binary_function<Bound,Interval,bool>{ struct In :public CGAL::binary_function<Bound,Interval,bool>{
bool operator()( Bound x, const Interval& a ) const { bool operator()( Bound x, const Interval& a ) const {
return a.inf() <= x && x <= a.sup(); return a.inf() <= x && x <= a.sup();
} }
}; };
struct Equal :public std::binary_function<Interval,Interval,bool>{ struct Equal :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return a.is_same(b); return a.is_same(b);
} }
}; };
struct Overlap :public std::binary_function<Interval,Interval,bool>{ struct Overlap :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return a.do_overlap(b); return a.do_overlap(b);
} }
}; };
struct Subset :public std::binary_function<Interval,Interval,bool>{ struct Subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return b.inf() <= a.inf() && a.sup() <= b.sup() ; return b.inf() <= a.inf() && a.sup() <= b.sup() ;
} }
}; };
struct Proper_subset :public std::binary_function<Interval,Interval,bool>{ struct Proper_subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return Subset()(a,b) && ! Equal()(a,b); return Subset()(a,b) && ! Equal()(a,b);
} }
}; };
struct Hull :public std::binary_function<Interval,Interval,Interval>{ struct Hull :public CGAL::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const { Interval operator()( const Interval& a, const Interval& b ) const {
BOOST_USING_STD_MAX(); BOOST_USING_STD_MAX();
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();
@ -277,7 +277,7 @@ public:
// struct Empty is Null_functor // struct Empty is Null_functor
struct Intersection :public std::binary_function<Interval,Interval,Interval>{ struct Intersection :public CGAL::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const { Interval operator()( const Interval& a, const Interval& b ) const {
BOOST_USING_STD_MAX(); BOOST_USING_STD_MAX();
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();

6
Number_types/include/CGAL/Gmpfr.h
View File

@ -55,7 +55,7 @@ public:
}; };
struct Is_square: struct Is_square:
public std::binary_function<Type,Type&,Boolean>{ public CGAL::binary_function<Type,Type&,Boolean>{
Boolean operator()(const Type &x,Type &y)const{ Boolean operator()(const Type &x,Type &y)const{
return x.is_square(y); return x.is_square(y);
}; };
@ -72,7 +72,7 @@ public:
}; };
struct Kth_Root: struct Kth_Root:
public std::binary_function<int,Type,Type>{ public CGAL::binary_function<int,Type,Type>{
Type operator()(int k,const Type &x)const{ Type operator()(int k,const Type &x)const{
return (k==3?x.cbrt():x.kthroot(k)); return (k==3?x.cbrt():x.kthroot(k));
}; };
@ -130,7 +130,7 @@ public INTERN_RET::Real_embeddable_traits_base<Gmpfr,CGAL::Tag_true>{
}; };
struct Compare: struct Compare:
public std::binary_function<Type,Type,Comparison_result>{ public CGAL::binary_function<Type,Type,Comparison_result>{
inline Comparison_result operator() inline Comparison_result operator()
(const Type &x,const Type &y)const{ (const Type &x,const Type &y)const{
return x.compare(y); return x.compare(y);

2
Number_types/include/CGAL/Gmpq.h
View File

@ -35,7 +35,7 @@ template <> class Algebraic_structure_traits< Gmpq >
typedef Tag_false Is_numerical_sensitive; typedef Tag_false Is_numerical_sensitive;
class Is_square class Is_square
: public std::binary_function< Type, Type&, : public CGAL::binary_function< Type, Type&,
bool > { bool > {
public: public:
bool operator()( const Type& x_, Type& y ) const { bool operator()( const Type& x_, Type& y ) const {

4
Number_types/include/CGAL/Gmpz.h
View File

@ -51,7 +51,7 @@ public:
typedef INTERN_AST::Is_square_per_sqrt< Type > typedef INTERN_AST::Is_square_per_sqrt< Type >
Is_square; Is_square;
class Integral_division class Integral_division
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -64,7 +64,7 @@ public:
}; };
class Gcd class Gcd
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,

10
Number_types/include/CGAL/Gmpzf.h
View File

@ -44,7 +44,7 @@ public:
}; };
struct Integral_division struct Integral_division
: public std::binary_function< Type, : public CGAL::binary_function< Type,
Type, Type,
Type > { Type > {
public: public:
@ -56,7 +56,7 @@ public:
}; };
struct Gcd struct Gcd
: public std::binary_function< Type, : public CGAL::binary_function< Type,
Type, Type,
Type > { Type > {
public: public:
@ -69,7 +69,7 @@ public:
}; };
class Div class Div
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
public: public:
Type operator()( const Type& x, const Type& y ) const { Type operator()( const Type& x, const Type& y ) const {
return Type(x).div( y ); return Type(x).div( y );
@ -79,7 +79,7 @@ public:
typedef INTERN_AST::Mod_per_operator< Type > Mod; typedef INTERN_AST::Mod_per_operator< Type > Mod;
class Is_square class Is_square
: public std::binary_function< Type, Type&, bool > { : public CGAL::binary_function< Type, Type&, bool > {
public: public:
bool operator()( const Type& x, Type& y ) const { bool operator()( const Type& x, Type& y ) const {
y = CGAL::approximate_sqrt(x); y = CGAL::approximate_sqrt(x);
@ -111,7 +111,7 @@ public:
}; };
struct Compare struct Compare
: public std::binary_function< Type, : public CGAL::binary_function< Type,
Type, Type,
Comparison_result > { Comparison_result > {
public: public:

38
Number_types/include/CGAL/Interval_nt.h
View File

@ -682,7 +682,7 @@ operator/ (const Interval_nt<Protected> & a, double b)
// TODO: What about these two guys? Where do they belong to? // TODO: What about these two guys? Where do they belong to?
template <bool Protected> template <bool Protected>
struct Min <Interval_nt<Protected> > struct Min <Interval_nt<Protected> >
: public std::binary_function<Interval_nt<Protected>, : public CGAL::binary_function<Interval_nt<Protected>,
Interval_nt<Protected>, Interval_nt<Protected>,
Interval_nt<Protected> > Interval_nt<Protected> >
{ {
@ -697,7 +697,7 @@ struct Min <Interval_nt<Protected> >
template <bool Protected> template <bool Protected>
struct Max <Interval_nt<Protected> > struct Max <Interval_nt<Protected> >
: public std::binary_function<Interval_nt<Protected>, : public CGAL::binary_function<Interval_nt<Protected>,
Interval_nt<Protected>, Interval_nt<Protected>,
Interval_nt<Protected> > Interval_nt<Protected> >
{ {
@ -744,7 +744,7 @@ ldexp(const Interval_nt<b> &i, int e)
// TODO: To which concept do these functors belong? Can we remove them?? // TODO: To which concept do these functors belong? Can we remove them??
template < bool b > template < bool b >
struct Equal_to < Interval_nt<b>, Interval_nt<b> > struct Equal_to < Interval_nt<b>, Interval_nt<b> >
: public std::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> > : public CGAL::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> >
{ {
Uncertain<bool> operator()( const Interval_nt<b>& x, Uncertain<bool> operator()( const Interval_nt<b>& x,
const Interval_nt<b>& y) const const Interval_nt<b>& y) const
@ -753,7 +753,7 @@ struct Equal_to < Interval_nt<b>, Interval_nt<b> >
template < bool b > template < bool b >
struct Not_equal_to < Interval_nt<b>, Interval_nt<b> > struct Not_equal_to < Interval_nt<b>, Interval_nt<b> >
: public std::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> > : public CGAL::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> >
{ {
Uncertain<bool> operator()( const Interval_nt<b>& x, Uncertain<bool> operator()( const Interval_nt<b>& x,
const Interval_nt<b>& y) const const Interval_nt<b>& y) const
@ -762,7 +762,7 @@ struct Not_equal_to < Interval_nt<b>, Interval_nt<b> >
template < bool b > template < bool b >
struct Greater < Interval_nt<b>, Interval_nt<b> > struct Greater < Interval_nt<b>, Interval_nt<b> >
: public std::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> > : public CGAL::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> >
{ {
Uncertain<bool> operator()( const Interval_nt<b>& x, Uncertain<bool> operator()( const Interval_nt<b>& x,
const Interval_nt<b>& y) const const Interval_nt<b>& y) const
@ -771,7 +771,7 @@ struct Greater < Interval_nt<b>, Interval_nt<b> >
template < bool b > template < bool b >
struct Less < Interval_nt<b>, Interval_nt<b> > struct Less < Interval_nt<b>, Interval_nt<b> >
: public std::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> > : public CGAL::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> >
{ {
Uncertain<bool> operator()( const Interval_nt<b>& x, Uncertain<bool> operator()( const Interval_nt<b>& x,
const Interval_nt<b>& y) const const Interval_nt<b>& y) const
@ -780,7 +780,7 @@ struct Less < Interval_nt<b>, Interval_nt<b> >
template < bool b > template < bool b >
struct Greater_equal < Interval_nt<b>, Interval_nt<b> > struct Greater_equal < Interval_nt<b>, Interval_nt<b> >
: public std::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> > : public CGAL::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> >
{ {
Uncertain<bool> operator()( const Interval_nt<b>& x, Uncertain<bool> operator()( const Interval_nt<b>& x,
const Interval_nt<b>& y) const const Interval_nt<b>& y) const
@ -789,7 +789,7 @@ struct Greater_equal < Interval_nt<b>, Interval_nt<b> >
template < bool b > template < bool b >
struct Less_equal < Interval_nt<b>, Interval_nt<b> > struct Less_equal < Interval_nt<b>, Interval_nt<b> >
: public std::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> > : public CGAL::binary_function< Interval_nt<b>, Interval_nt<b>, Uncertain<bool> >
{ {
Uncertain<bool> operator()( const Interval_nt<b>& x, Uncertain<bool> operator()( const Interval_nt<b>& x,
const Interval_nt<b>& y) const const Interval_nt<b>& y) const
@ -991,7 +991,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, Comparison_result > { : public CGAL::binary_function< Type, Type, Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, const Type& y ) const { Comparison_result operator()( const Type& x, const Type& y ) const {
return INTERN_INTERVAL_NT::compare( x, y ); return INTERN_INTERVAL_NT::compare( x, y );
@ -1070,7 +1070,7 @@ class Algebraic_structure_traits< Interval_nt<B> >
}; };
struct Is_square struct Is_square
:public std::binary_function<Interval_nt<B>,Interval_nt<B>&,Boolean > :public CGAL::binary_function<Interval_nt<B>,Interval_nt<B>&,Boolean >
{ {
Boolean operator()(const Interval_nt<B>& x) const { Boolean operator()(const Interval_nt<B>& x) const {
return INTERN_INTERVAL_NT::is_positive( x ); return INTERN_INTERVAL_NT::is_positive( x );
@ -1093,7 +1093,7 @@ class Algebraic_structure_traits< Interval_nt<B> >
}; };
class Divides class Divides
: public std::binary_function< Type, Type, Boolean > { : public CGAL::binary_function< Type, Type, Boolean > {
public: public:
Boolean operator()( const Type& x, const Type&) const { Boolean operator()( const Type& x, const Type&) const {
return ! Is_zero()(x); return ! Is_zero()(x);
@ -1154,7 +1154,7 @@ public:
typedef CGAL::Tag_false With_empty_interval; typedef CGAL::Tag_false With_empty_interval;
typedef CGAL::Tag_true Is_interval; typedef CGAL::Tag_true Is_interval;
struct Construct :public std::binary_function<Bound,Bound,Interval>{ struct Construct :public CGAL::binary_function<Bound,Bound,Interval>{
Interval operator()( const Bound& l,const Bound& r) const { Interval operator()( const Bound& l,const Bound& r) const {
CGAL_precondition( l < r ); CGAL_precondition( l < r );
return Interval(l,r); return Interval(l,r);
@ -1203,37 +1203,37 @@ public:
} }
}; };
struct In :public std::binary_function<Bound,Interval,bool>{ struct In :public CGAL::binary_function<Bound,Interval,bool>{
bool operator()( Bound x, const Interval& a ) const { bool operator()( Bound x, const Interval& a ) const {
return Lower()(a) <= x && x <= Upper()(a); return Lower()(a) <= x && x <= Upper()(a);
} }
}; };
struct Equal :public std::binary_function<Interval,Interval,bool>{ struct Equal :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return a.is_same(b); return a.is_same(b);
} }
}; };
struct Overlap :public std::binary_function<Interval,Interval,bool>{ struct Overlap :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return a.do_overlap(b); return a.do_overlap(b);
} }
}; };
struct Subset :public std::binary_function<Interval,Interval,bool>{ struct Subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return Lower()(b) <= Lower()(a) && Upper()(a) <= Upper()(b) ; return Lower()(b) <= Lower()(a) && Upper()(a) <= Upper()(b) ;
} }
}; };
struct Proper_subset :public std::binary_function<Interval,Interval,bool>{ struct Proper_subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return Subset()(a,b) && ! Equal()(a,b); return Subset()(a,b) && ! Equal()(a,b);
} }
}; };
struct Hull :public std::binary_function<Interval,Interval,Interval>{ struct Hull :public CGAL::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const { Interval operator()( const Interval& a, const Interval& b ) const {
BOOST_USING_STD_MAX(); BOOST_USING_STD_MAX();
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();
@ -1247,7 +1247,7 @@ public:
// struct Empty is Null_functor // struct Empty is Null_functor
struct Intersection :public std::binary_function<Interval,Interval,Interval>{ struct Intersection :public CGAL::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const { Interval operator()( const Interval& a, const Interval& b ) const {
BOOST_USING_STD_MAX(); BOOST_USING_STD_MAX();
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();

22
Number_types/include/CGAL/Lazy_exact_nt.h
View File

@ -757,7 +757,7 @@ struct Square_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Integral_division_selector { struct Integral_division_selector {
struct Integral_division : public std::binary_function<NT, NT, NT > { struct Integral_division : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
return NT( CGAL_NTS integral_division( x.exact(), y.exact() ) ); return NT( CGAL_NTS integral_division( x.exact(), y.exact() ) );
} }
@ -773,7 +773,7 @@ struct Integral_division_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Is_square_selector { struct Is_square_selector {
struct Is_square : public std::binary_function<NT, NT&, bool > { struct Is_square : public CGAL::binary_function<NT, NT&, bool > {
bool operator()( const NT& x, NT& y ) const { bool operator()( const NT& x, NT& y ) const {
typename NT::ET y_et; typename NT::ET y_et;
bool result = CGAL_NTS is_square( x.exact(), y_et ); bool result = CGAL_NTS is_square( x.exact(), y_et );
@ -810,7 +810,7 @@ struct Sqrt_selector<NT,Null_functor> {
template< class NT, class Functor > template< class NT, class Functor >
struct Kth_root_selector { struct Kth_root_selector {
struct Kth_root : public std::binary_function<int, NT, NT > { struct Kth_root : public CGAL::binary_function<int, NT, NT > {
NT operator()( int k, const NT& x ) const { NT operator()( int k, const NT& x ) const {
return NT( CGAL_NTS kth_root( k, x.exact() ) ); return NT( CGAL_NTS kth_root( k, x.exact() ) );
} }
@ -855,7 +855,7 @@ struct Root_of_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Gcd_selector { struct Gcd_selector {
struct Gcd : public std::binary_function<NT, NT, NT > { struct Gcd : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION)); CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION));
return NT( CGAL_NTS gcd( x.exact(), y.exact() ) ); return NT( CGAL_NTS gcd( x.exact(), y.exact() ) );
@ -872,7 +872,7 @@ struct Gcd_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Div_selector { struct Div_selector {
struct Div : public std::binary_function<NT, NT, NT > { struct Div : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
return NT( CGAL_NTS div( x.exact(), y.exact() ) ); return NT( CGAL_NTS div( x.exact(), y.exact() ) );
} }
@ -904,7 +904,7 @@ struct Inverse_selector< NT, Null_functor > {
template< class NT, class Functor > template< class NT, class Functor >
struct Mod_selector { struct Mod_selector {
struct Mod : public std::binary_function<NT, NT, NT > { struct Mod : public CGAL::binary_function<NT, NT, NT > {
NT operator()( const NT& x, const NT& y ) const { NT operator()( const NT& x, const NT& y ) const {
return NT( CGAL_NTS mod( x.exact(), y.exact() ) ); return NT( CGAL_NTS mod( x.exact(), y.exact() ) );
} }
@ -1054,7 +1054,7 @@ template < typename ET > class Real_embeddable_traits< Lazy_exact_nt<ET> >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& a, Comparison_result operator()( const Type& a,
@ -1215,13 +1215,13 @@ public:
typedef Lazy_exact_nt<ET_numerator> Numerator_type; typedef Lazy_exact_nt<ET_numerator> Numerator_type;
typedef Lazy_exact_nt<ET_denominator> Denominator_type; typedef Lazy_exact_nt<ET_denominator> Denominator_type;
struct Common_factor : std::binary_function<Denominator_type,Denominator_type,Denominator_type>{ struct Common_factor : CGAL::binary_function<Denominator_type,Denominator_type,Denominator_type>{
Denominator_type operator()(const Denominator_type& a, const Denominator_type& b) const { Denominator_type operator()(const Denominator_type& a, const Denominator_type& b) const {
typename ETT::Common_factor common_factor; typename ETT::Common_factor common_factor;
return Denominator_type(common_factor(a.exact(),b.exact())); return Denominator_type(common_factor(a.exact(),b.exact()));
} }
}; };
struct Compose : std::binary_function<Type,Numerator_type,Denominator_type>{ struct Compose : CGAL::binary_function<Type,Numerator_type,Denominator_type>{
Type operator()(const Numerator_type& n, const Denominator_type& d) const { Type operator()(const Numerator_type& n, const Denominator_type& d) const {
typename ETT::Compose compose; typename ETT::Compose compose;
return Type(compose(n.exact(),d.exact())); return Type(compose(n.exact(),d.exact()));
@ -1253,7 +1253,7 @@ class Fraction_traits< Lazy_exact_nt< ET > >
template < class ET > template < class ET >
struct Min <Lazy_exact_nt<ET> > struct Min <Lazy_exact_nt<ET> >
: public std::binary_function<Lazy_exact_nt<ET>,Lazy_exact_nt<ET>,Lazy_exact_nt<ET> > { : public CGAL::binary_function<Lazy_exact_nt<ET>,Lazy_exact_nt<ET>,Lazy_exact_nt<ET> > {
Lazy_exact_nt<ET> operator()( const Lazy_exact_nt<ET>& x, const Lazy_exact_nt<ET>& y) const Lazy_exact_nt<ET> operator()( const Lazy_exact_nt<ET>& x, const Lazy_exact_nt<ET>& y) const
{ {
@ -1271,7 +1271,7 @@ struct Min <Lazy_exact_nt<ET> >
template < class ET > template < class ET >
struct Max <Lazy_exact_nt<ET> > struct Max <Lazy_exact_nt<ET> >
: public std::binary_function<Lazy_exact_nt<ET>,Lazy_exact_nt<ET>,Lazy_exact_nt<ET> > { : public CGAL::binary_function<Lazy_exact_nt<ET>,Lazy_exact_nt<ET>,Lazy_exact_nt<ET> > {
Lazy_exact_nt<ET> operator()( const Lazy_exact_nt<ET>& x, const Lazy_exact_nt<ET>& y) const Lazy_exact_nt<ET> operator()( const Lazy_exact_nt<ET>& x, const Lazy_exact_nt<ET>& y) const
{ {

10
Number_types/include/CGAL/MP_Float.h
View File

@ -424,7 +424,7 @@ template <> class Algebraic_structure_traits< MP_Float >
}; };
struct Integral_division struct Integral_division
: public std::binary_function< Type, : public CGAL::binary_function< Type,
Type, Type,
Type > { Type > {
public: public:
@ -448,7 +448,7 @@ template <> class Algebraic_structure_traits< MP_Float >
}; };
class Gcd class Gcd
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -458,7 +458,7 @@ template <> class Algebraic_structure_traits< MP_Float >
}; };
class Div class Div
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -471,7 +471,7 @@ template <> class Algebraic_structure_traits< MP_Float >
// Default implementation of Divides functor for unique factorization domains // Default implementation of Divides functor for unique factorization domains
// x divides y if gcd(y,x) equals x up to inverses // x divides y if gcd(y,x) equals x up to inverses
class Divides class Divides
: public std::binary_function<Type,Type,bool>{ : public CGAL::binary_function<Type,Type,bool>{
public: public:
bool operator()( const Type& x, const Type& y) const { bool operator()( const Type& x, const Type& y) const {
return internal::division(y,x).second == 0 ; return internal::division(y,x).second == 0 ;
@ -501,7 +501,7 @@ template <> class Real_embeddable_traits< MP_Float >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

8
Number_types/include/CGAL/Mpzf.h
View File

@ -1034,7 +1034,7 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
}; };
struct Gcd struct Gcd
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
Type operator()( Type operator()(
const Type& x, const Type& x,
const Type& y ) const { const Type& y ) const {
@ -1050,7 +1050,7 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
}; };
struct Integral_division struct Integral_division
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
Type operator()( Type operator()(
const Type& x, const Type& x,
const Type& y ) const { const Type& y ) const {
@ -1066,7 +1066,7 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
}; };
struct Is_square struct Is_square
: public std::binary_function< Type, Type&, bool > { : public CGAL::binary_function< Type, Type&, bool > {
bool operator()( const Type& x, Type& y ) const { bool operator()( const Type& x, Type& y ) const {
// TODO: avoid doing 2 calls. // TODO: avoid doing 2 calls.
if (!Mpzf_is_square(x)) return false; if (!Mpzf_is_square(x)) return false;
@ -1096,7 +1096,7 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
}; };
struct Compare struct Compare
: public std::binary_function< Type, Type, Comparison_result > { : public CGAL::binary_function< Type, Type, Comparison_result > {
Comparison_result operator()( Comparison_result operator()(
const Type& x, const Type& x,
const Type& y ) const { const Type& y ) const {

12
Number_types/include/CGAL/Number_type_checker.h
View File

@ -506,7 +506,7 @@ public:
// CGAL::Algebraic_structure_traits< >::Integral_division // CGAL::Algebraic_structure_traits< >::Integral_division
class Integral_division class Integral_division
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
public: public:
Type operator()( const Type& a, const Type& b) const { Type operator()( const Type& a, const Type& b) const {
CGAL_NT_CHECK_DEBUG("AST::Integral_division"); CGAL_NT_CHECK_DEBUG("AST::Integral_division");
@ -517,7 +517,7 @@ public:
}; };
class Divides class Divides
: public std::binary_function< Type, Type, bool > { : public CGAL::binary_function< Type, Type, bool > {
public: public:
bool operator()( const Type& a, const Type& b) const { bool operator()( const Type& a, const Type& b) const {
CGAL_NT_CHECK_DEBUG("AST::Divides"); CGAL_NT_CHECK_DEBUG("AST::Divides");
@ -554,7 +554,7 @@ private:
public: public:
// CGAL::Algebraic_structure_traits< >::Gcd // CGAL::Algebraic_structure_traits< >::Gcd
class Gcd class Gcd
: public std::binary_function< Type, : public CGAL::binary_function< Type,
Type, Type,
Type > { Type > {
public: public:
@ -582,7 +582,7 @@ private:
public: public:
// CGAL::Algebraic_structure_traits< >::Div // CGAL::Algebraic_structure_traits< >::Div
class Div class Div
: public std::binary_function< Type, : public CGAL::binary_function< Type,
Type, Type,
Type > { Type > {
public: public:
@ -597,7 +597,7 @@ public:
}; };
// CGAL::Algebraic_structure_traits< >::Mod // CGAL::Algebraic_structure_traits< >::Mod
class Mod class Mod
: public std::binary_function< Type, : public CGAL::binary_function< Type,
Type, Type,
Type > { Type > {
public: public:
@ -797,7 +797,7 @@ public:
// CGAL::Real_embeddable_traits< >::Compare // CGAL::Real_embeddable_traits< >::Compare
class Compare class Compare
: public std::binary_function< Type , Type, Comparison_result > { : public CGAL::binary_function< Type , Type, Comparison_result > {
public: public:
Comparison_result operator()(const Type& a, const Type& b) const { Comparison_result operator()(const Type& a, const Type& b) const {
CGAL_NT_CHECK_DEBUG("RET::Compare"); CGAL_NT_CHECK_DEBUG("RET::Compare");

4
Number_types/include/CGAL/Quotient.h
View File

@ -638,7 +638,7 @@ public:
class Is_square class Is_square
: public std::binary_function< Quotient<NT>, Quotient<NT>&, bool > { : public CGAL::binary_function< Quotient<NT>, Quotient<NT>&, bool > {
public: public:
bool operator()( Quotient<NT> x, Quotient<NT>& y ) const { bool operator()( Quotient<NT> x, Quotient<NT>& y ) const {
NT x_num, x_den, y_num, y_den; NT x_num, x_den, y_num, y_den;
@ -687,7 +687,7 @@ template < class NT > class Real_embeddable_traits_quotient_base< Quotient<NT> >
typedef Quotient<NT> Type; typedef Quotient<NT> Type;
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

4
Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h
View File

@ -61,7 +61,7 @@ public:
typedef CGAL::Integral_domain_tag Algebraic_category; typedef CGAL::Integral_domain_tag Algebraic_category;
class Integral_division class Integral_division
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
public: public:
Type operator()( const Type& x,const Type& y ) const { Type operator()( const Type& x,const Type& y ) const {
return x/y; return x/y;
@ -77,7 +77,7 @@ private:
typedef typename AST_COEFF::Divides Divides_coeff; typedef typename AST_COEFF::Divides Divides_coeff;
public: public:
class Divides class Divides
: public std::binary_function<Type,Type,typename Divides_coeff::result_type>{ : public CGAL::binary_function<Type,Type,typename Divides_coeff::result_type>{
typedef typename Divides_coeff::result_type BOOL; typedef typename Divides_coeff::result_type BOOL;
public: public:
BOOL operator()( const Type& x, const Type& y) const { BOOL operator()( const Type& x, const Type& y) const {

2
Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h
View File

@ -43,7 +43,7 @@ class Real_embeddable_traits< Sqrt_extension<COEFF, ROOT, ACDE_TAG,FP_TAG> >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, Comparison_result > { : public CGAL::binary_function< Type, Type, Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, const Type& y) const { Comparison_result operator()( const Type& x, const Type& y) const {
// must be from the same extension // must be from the same extension

2
Number_types/include/CGAL/double.h
View File

@ -114,7 +114,7 @@ template <> class Algebraic_structure_traits< double >
}; };
class Kth_root class Kth_root
: public std::binary_function<int, Type, Type> { : public CGAL::binary_function<int, Type, Type> {
public: public:
Type operator()( int k, Type operator()( int k,
const Type& x) const { const Type& x) const {

2
Number_types/include/CGAL/float.h
View File

@ -100,7 +100,7 @@ template <> class Algebraic_structure_traits< float >
}; };
class Kth_root class Kth_root
: public std::binary_function<int, Type, Type> { : public CGAL::binary_function<int, Type, Type> {
public: public:
Type operator()( int k, const Type& x) const { Type operator()( int k, const Type& x) const {
CGAL_precondition_msg( k > 0, "'k' must be positive for k-th roots"); CGAL_precondition_msg( k > 0, "'k' must be positive for k-th roots");

10
Number_types/include/CGAL/int.h
View File

@ -37,7 +37,7 @@ namespace CGAL {
namespace INTERN_INT { namespace INTERN_INT {
template< class Type > template< class Type >
class Is_square_per_double_conversion class Is_square_per_double_conversion
: public std::binary_function< Type, Type&, : public CGAL::binary_function< Type, Type&,
bool > { bool > {
public: public:
bool operator()( const Type& x, bool operator()( const Type& x,
@ -168,7 +168,7 @@ template<> class Algebraic_structure_traits< short int >
// interoperability. This is nescessary because of the implicit conversion // interoperability. This is nescessary because of the implicit conversion
// to int for binary operations between short ints. // to int for binary operations between short ints.
class Integral_division class Integral_division
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -182,7 +182,7 @@ template<> class Algebraic_structure_traits< short int >
}; };
class Gcd class Gcd
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -242,7 +242,7 @@ template<> class Algebraic_structure_traits< short int >
// based on \c Div_mod. // based on \c Div_mod.
class Div class Div
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -253,7 +253,7 @@ template<> class Algebraic_structure_traits< short int >
// based on \c Div_mod. // based on \c Div_mod.
class Mod class Mod
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,

4
Number_types/include/CGAL/leda_bigfloat.h
View File

@ -52,7 +52,7 @@ template <> class Algebraic_structure_traits< leda_bigfloat >
}; };
class Kth_root class Kth_root
: public std::binary_function<int, Type, Type> { : public CGAL::binary_function<int, Type, Type> {
public: public:
Type operator()( int k, Type operator()( int k,
const Type& x) const { const Type& x) const {
@ -88,7 +88,7 @@ public:
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

16
Number_types/include/CGAL/leda_bigfloat_interval.h
View File

@ -313,7 +313,7 @@ public:
typedef CGAL::Tag_true Is_interval; typedef CGAL::Tag_true Is_interval;
typedef CGAL::Tag_true With_empty_interval; typedef CGAL::Tag_true With_empty_interval;
struct Construct :public std::binary_function<Bound,Bound,Interval>{ struct Construct :public CGAL::binary_function<Bound,Bound,Interval>{
Interval operator()( const Bound& l,const Bound& r) const { Interval operator()( const Bound& l,const Bound& r) const {
CGAL_precondition( l < r ); CGAL_precondition( l < r );
return Interval(l,r); return Interval(l,r);
@ -368,43 +368,43 @@ public:
} }
}; };
struct In :public std::binary_function<Bound,Interval,bool>{ struct In :public CGAL::binary_function<Bound,Interval,bool>{
bool operator()( Bound x, const Interval& a ) const { bool operator()( Bound x, const Interval& a ) const {
return ::boost::numeric::in(x,a); return ::boost::numeric::in(x,a);
} }
}; };
struct Equal :public std::binary_function<Interval,Interval,bool>{ struct Equal :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return ::boost::numeric::equal(a,b); return ::boost::numeric::equal(a,b);
} }
}; };
struct Overlap :public std::binary_function<Interval,Interval,bool>{ struct Overlap :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return ::boost::numeric::overlap(a,b); return ::boost::numeric::overlap(a,b);
} }
}; };
struct Subset :public std::binary_function<Interval,Interval,bool>{ struct Subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return ::boost::numeric::subset(a,b); return ::boost::numeric::subset(a,b);
} }
}; };
struct Proper_subset :public std::binary_function<Interval,Interval,bool>{ struct Proper_subset :public CGAL::binary_function<Interval,Interval,bool>{
bool operator()( const Interval& a, const Interval& b ) const { bool operator()( const Interval& a, const Interval& b ) const {
return ::boost::numeric::proper_subset(a,b); return ::boost::numeric::proper_subset(a,b);
} }
}; };
struct Hull :public std::binary_function<Interval,Interval,Interval>{ struct Hull :public CGAL::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const { Interval operator()( const Interval& a, const Interval& b ) const {
return ::boost::numeric::hull(a,b); return ::boost::numeric::hull(a,b);
} }
}; };
struct Intersection :public std::binary_function<Interval,Interval,Interval>{ struct Intersection :public CGAL::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const { Interval operator()( const Interval& a, const Interval& b ) const {
Interval r = ::boost::numeric::intersect(a,b); Interval r = ::boost::numeric::intersect(a,b);
return r; return r;

6
Number_types/include/CGAL/leda_integer.h
View File

@ -53,7 +53,7 @@ template <> class Algebraic_structure_traits< leda_integer >
Is_square; Is_square;
class Gcd class Gcd
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Type > { Type > {
public: public:
Type operator()( const Type& x, Type operator()( const Type& x,
@ -106,7 +106,7 @@ template <> class Algebraic_structure_traits< leda_integer >
// typedef INTERN_AST::Div_per_operator< Type > Div; // typedef INTERN_AST::Div_per_operator< Type > Div;
// class Mod // class Mod
// : public std::binary_function< Type, Type, // : public CGAL::binary_function< Type, Type,
// Type > { // Type > {
// public: // public:
// Type operator()( const Type& x, const Type& y ) const { // Type operator()( const Type& x, const Type& y ) const {
@ -146,7 +146,7 @@ template <> class Real_embeddable_traits< leda_integer >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

2
Number_types/include/CGAL/leda_rational.h
View File

@ -93,7 +93,7 @@ template <> class Real_embeddable_traits< leda_rational >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

4
Number_types/include/CGAL/leda_real.h
View File

@ -58,7 +58,7 @@ template <> class Algebraic_structure_traits< leda_real >
}; };
class Kth_root class Kth_root
: public std::binary_function<int, Type, Type> { : public CGAL::binary_function<int, Type, Type> {
public: public:
Type operator()( int k, Type operator()( int k,
const Type& x) const { const Type& x) const {
@ -125,7 +125,7 @@ template <> class Real_embeddable_traits< leda_real >
}; };
class Compare class Compare
: public std::binary_function< Type, Type, : public CGAL::binary_function< Type, Type,
Comparison_result > { Comparison_result > {
public: public:
Comparison_result operator()( const Type& x, Comparison_result operator()( const Type& x,

2
Number_types/include/CGAL/long_double.h
View File

@ -104,7 +104,7 @@ template <> class Algebraic_structure_traits< long double >
}; };
class Kth_root class Kth_root
:public std::binary_function<int, Type, Type > { :public CGAL::binary_function<int, Type, Type > {
public: public:
Type operator()( int k, Type operator()( int k,
const Type& x) const { const Type& x) const {

2
Number_types/include/CGAL/long_long.h
View File

@ -45,7 +45,7 @@ template<> class Algebraic_structure_traits< long long int >
typedef INTERN_AST::Mod_per_operator< Type > Mod; typedef INTERN_AST::Mod_per_operator< Type > Mod;
class Is_square class Is_square
: public std::binary_function< Type, Type&, : public CGAL::binary_function< Type, Type&,
bool > { bool > {
public: public:
bool operator()( const Type& x, bool operator()( const Type& x,

6
Number_types/include/CGAL/mpq_class.h
View File

@ -92,7 +92,7 @@ class Algebraic_structure_traits< mpq_class >
}; };
struct Integral_division struct Integral_division
: public std::binary_function< mpq_class , mpq_class, mpq_class > { : public CGAL::binary_function< mpq_class , mpq_class, mpq_class > {
template <typename T, typename U1, typename U2> template <typename T, typename U1, typename U2>
mpq_class operator()( mpq_class operator()(
const ::__gmp_expr< T , U1 >& x, const ::__gmp_expr< T , U1 >& x,
@ -108,7 +108,7 @@ class Algebraic_structure_traits< mpq_class >
}; };
class Is_square class Is_square
: public std::binary_function< mpq_class, mpq_class&, bool > { : public CGAL::binary_function< mpq_class, mpq_class&, bool > {
public: public:
bool operator()( const mpq_class& x, mpq_class& y ) const { bool operator()( const mpq_class& x, mpq_class& y ) const {
y = mpq_class (::sqrt( x.get_num() ), ::sqrt( x.get_den() )) ; y = mpq_class (::sqrt( x.get_num() ), ::sqrt( x.get_den() )) ;
@ -181,7 +181,7 @@ class Real_embeddable_traits< mpq_class >
}; };
struct Compare struct Compare
: public std::binary_function< mpq_class, mpq_class, Comparison_result> : public CGAL::binary_function< mpq_class, mpq_class, Comparison_result>
{ {
template <typename T, typename U1, typename U2> template <typename T, typename U1, typename U2>
Comparison_result operator()( Comparison_result operator()(

12
Number_types/include/CGAL/mpz_class.h
View File

@ -95,7 +95,7 @@ public:
struct Integral_division: struct Integral_division:
public std::binary_function< mpz_class , mpz_class, mpz_class > { public CGAL::binary_function< mpz_class , mpz_class, mpz_class > {
template <typename T, typename U1, typename U2> template <typename T, typename U1, typename U2>
mpz_class operator()( mpz_class operator()(
const ::__gmp_expr< T , U1 >& x, const ::__gmp_expr< T , U1 >& x,
@ -110,7 +110,7 @@ public:
CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR( Type ) CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR( Type )
}; };
struct Gcd : public std::binary_function< mpz_class, mpz_class, mpz_class > { struct Gcd : public CGAL::binary_function< mpz_class, mpz_class, mpz_class > {
mpz_class operator()( mpz_class operator()(
const mpz_class& x, const mpz_class& x,
const mpz_class& y) const { const mpz_class& y) const {
@ -121,7 +121,7 @@ public:
CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR( Type ) CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR( Type )
}; };
struct Div : public std::binary_function< mpz_class, mpz_class, mpz_class > { struct Div : public CGAL::binary_function< mpz_class, mpz_class, mpz_class > {
template <typename T, typename U1, typename U2> template <typename T, typename U1, typename U2>
mpz_class operator()( mpz_class operator()(
const ::__gmp_expr< T , U1 >& x, const ::__gmp_expr< T , U1 >& x,
@ -132,7 +132,7 @@ public:
CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR( Type ) CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR( Type )
}; };
struct Mod : public std::binary_function< mpz_class, mpz_class, mpz_class > { struct Mod : public CGAL::binary_function< mpz_class, mpz_class, mpz_class > {
template <typename T, typename U1, typename U2> template <typename T, typename U1, typename U2>
mpz_class operator()( mpz_class operator()(
const ::__gmp_expr< T , U1 >& x, const ::__gmp_expr< T , U1 >& x,
@ -174,7 +174,7 @@ public:
}; };
/*struct Is_square: public std::binary_function< mpz_class , mpz_class& , bool > { /*struct Is_square: public CGAL::binary_function< mpz_class , mpz_class& , bool > {
template <typename T, typename U> template <typename T, typename U>
bool operator()( bool operator()(
const ::__gmp_expr< T , U >& x, const ::__gmp_expr< T , U >& x,
@ -246,7 +246,7 @@ public:
}; };
struct Compare struct Compare
: public std::binary_function< mpz_class, mpz_class, Comparison_result > { : public CGAL::binary_function< mpz_class, mpz_class, Comparison_result > {
template <typename T, typename U1, typename U2> template <typename T, typename U1, typename U2>
Comparison_result operator()( Comparison_result operator()(
const ::__gmp_expr< T , U1 >& x, const ::__gmp_expr< T , U1 >& x,

20
Number_types/include/CGAL/utils_classes.h
View File

@ -27,43 +27,43 @@
namespace CGAL { namespace CGAL {
template < class A, class B = A > template < class A, class B = A >
struct Equal_to : public std::binary_function< A, B, bool > { struct Equal_to : public CGAL::binary_function< A, B, bool > {
bool operator()( const A& x, const B& y) const bool operator()( const A& x, const B& y) const
{ return x == y; } { return x == y; }
}; };
template < class A, class B = A > template < class A, class B = A >
struct Not_equal_to : public std::binary_function< A, B, bool > { struct Not_equal_to : public CGAL::binary_function< A, B, bool > {
bool operator()( const A& x, const B& y) const bool operator()( const A& x, const B& y) const
{ return x != y; } { return x != y; }
}; };
template < class A, class B = A > template < class A, class B = A >
struct Greater : public std::binary_function< A, B, bool > { struct Greater : public CGAL::binary_function< A, B, bool > {
bool operator()( const A& x, const B& y) const bool operator()( const A& x, const B& y) const
{ return x > y; } { return x > y; }
}; };
template < class A, class B = A > template < class A, class B = A >
struct Less : public std::binary_function< A, B, bool > { struct Less : public CGAL::binary_function< A, B, bool > {
bool operator()( const A& x, const B& y) const bool operator()( const A& x, const B& y) const
{ return x < y; } { return x < y; }
}; };
template < class A, class B = A > template < class A, class B = A >
struct Greater_equal : public std::binary_function< A, B, bool > { struct Greater_equal : public CGAL::binary_function< A, B, bool > {
bool operator()( const A& x, const B& y) const bool operator()( const A& x, const B& y) const
{ return x >= y; } { return x >= y; }
}; };
template < class A, class B = A > template < class A, class B = A >
struct Less_equal : public std::binary_function< A, B, bool > { struct Less_equal : public CGAL::binary_function< A, B, bool > {
bool operator()( const A& x, const B& y) const bool operator()( const A& x, const B& y) const
{ return x <= y; } { return x <= y; }
}; };
template < class NT, class Less = std::less< NT > > template < class NT, class Less = std::less< NT > >
struct Min :public std::binary_function< NT, NT, NT > { struct Min :public CGAL::binary_function< NT, NT, NT > {
Min() {} Min() {}
Min(const Less& c_) : c(c_) {} Min(const Less& c_) : c(c_) {}
NT operator()( const NT& x, const NT& y) const NT operator()( const NT& x, const NT& y) const
@ -73,7 +73,7 @@ protected:
}; };
template < class NT, class Less = std::less< NT > > template < class NT, class Less = std::less< NT > >
struct Max :public std::binary_function< NT, NT, NT > { struct Max :public CGAL::binary_function< NT, NT, NT > {
Max() {} Max() {}
Max(const Less& c_) : c(c_) {} Max(const Less& c_) : c(c_) {}
NT operator()( const NT& x, const NT& y) const NT operator()( const NT& x, const NT& y) const
@ -198,7 +198,7 @@ inline void sse2minmax(double& a, double b, double& c)
#endif // CGAL_USE_SSE2_MAX #endif // CGAL_USE_SSE2_MAX
template <> template <>
struct Max<double> :public std::binary_function< double, double, double > { struct Max<double> :public CGAL::binary_function< double, double, double > {
Max() {} Max() {}
double operator()( const double& x, const double& y) const double operator()( const double& x, const double& y) const
@ -230,7 +230,7 @@ struct Max<double> :public std::binary_function< double, double, double > {
}; };
template <> template <>
struct Min<double> :public std::binary_function< double, double, double > { struct Min<double> :public CGAL::binary_function< double, double, double > {
Min() {} Min() {}
double operator()( const double& x, const double& y) const double operator()( const double& x, const double& y) const

8
Number_types/test/Number_types/checked_NT.h
View File

@ -81,7 +81,7 @@ template<class NT1,class NT2> struct Algebraic_structure_traits<checked_NT<NT1,N
} }
}; };
struct Div struct Div
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
Type operator()( const Type& x, const Type& y ) const { Type operator()( const Type& x, const Type& y ) const {
return Type(typename Type::pieces(), return Type(typename Type::pieces(),
CGAL::div(x.x1,y.x1), CGAL::div(x.x1,y.x1),
@ -89,7 +89,7 @@ template<class NT1,class NT2> struct Algebraic_structure_traits<checked_NT<NT1,N
} }
}; };
struct Mod struct Mod
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
Type operator()( const Type& x, const Type& y ) const { Type operator()( const Type& x, const Type& y ) const {
return Type(typename Type::pieces(), return Type(typename Type::pieces(),
CGAL::mod(x.x1,y.x1), CGAL::mod(x.x1,y.x1),
@ -97,7 +97,7 @@ template<class NT1,class NT2> struct Algebraic_structure_traits<checked_NT<NT1,N
} }
}; };
struct Integral_division struct Integral_division
: public std::binary_function< Type, Type, Type > { : public CGAL::binary_function< Type, Type, Type > {
Type operator()( const Type& x, const Type& y ) const { Type operator()( const Type& x, const Type& y ) const {
return Type(typename Type::pieces(), return Type(typename Type::pieces(),
CGAL::integral_division(x.x1,y.x1), CGAL::integral_division(x.x1,y.x1),
@ -131,7 +131,7 @@ template<class NT1,class NT2>struct Real_embeddable_traits<checked_NT<NT1,NT2> >
} }
}; };
struct Compare struct Compare
: public std::binary_function< Type, Type, Comparison_result > { : public CGAL::binary_function< Type, Type, Comparison_result > {
Comparison_result operator()( Comparison_result operator()(
const Type& x, const Type& x,
const Type& y ) const { const Type& y ) const {

2
Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_implicit_surface_oracle_3.h
View File

@ -102,7 +102,7 @@ namespace CGAL {
namespace { namespace {
template <typename T> template <typename T>
struct Return_min : std::binary_function<T, T, T> struct Return_min : CGAL::binary_function<T, T, T>
{ {
T operator()(const T& a, const T& b) const T operator()(const T& a, const T& b) const
{ {

10
Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h
View File

@ -121,7 +121,7 @@ class Polynomial_algebraic_structure_traits_base< POLY, Integral_domain_tag >
typedef Integral_domain_tag Algebraic_category; typedef Integral_domain_tag Algebraic_category;
class Integral_division class Integral_division
: public std::binary_function< POLY, POLY, POLY > { : public CGAL::binary_function< POLY, POLY, POLY > {
public: public:
POLY operator()( const POLY& x, const POLY& y ) const { POLY operator()( const POLY& x, const POLY& y ) const {
return x / y; return x / y;
@ -135,7 +135,7 @@ private:
typedef typename Divides_coeff::result_type BOOL; typedef typename Divides_coeff::result_type BOOL;
public: public:
class Divides class Divides
: public std::binary_function<POLY,POLY,BOOL>{ : public CGAL::binary_function<POLY,POLY,BOOL>{
public: public:
BOOL operator()( const POLY& p1, const POLY& p2) const { BOOL operator()( const POLY& p1, const POLY& p2) const {
POLY q; POLY q;
@ -209,7 +209,7 @@ class Polynomial_algebraic_structure_traits_base< POLY, Unique_factorization_dom
typedef Unique_factorization_domain_tag Algebraic_category; typedef Unique_factorization_domain_tag Algebraic_category;
class Gcd class Gcd
: public std::binary_function< POLY, POLY, POLY > { : public CGAL::binary_function< POLY, POLY, POLY > {
typedef typename Polynomial_traits_d<POLY>::Multivariate_content Mcontent; typedef typename Polynomial_traits_d<POLY>::Multivariate_content Mcontent;
typedef typename Mcontent::result_type ICoeff; typedef typename Mcontent::result_type ICoeff;
@ -292,7 +292,7 @@ class Polynomial_algebraic_structure_traits_base< POLY, Field_tag >
}; };
class Div class Div
: public std::binary_function< POLY, POLY, POLY > { : public CGAL::binary_function< POLY, POLY, POLY > {
public: public:
POLY operator()(const POLY& a, const POLY& b) const { POLY operator()(const POLY& a, const POLY& b) const {
POLY q, r; POLY q, r;
@ -304,7 +304,7 @@ class Polynomial_algebraic_structure_traits_base< POLY, Field_tag >
}; };
class Mod class Mod
: public std::binary_function< POLY, POLY, POLY > { : public CGAL::binary_function< POLY, POLY, POLY > {
public: public:
POLY operator () (const POLY& a, const POLY& b) const { POLY operator () (const POLY& a, const POLY& b) const {
POLY q, r; POLY q, r;

28
Polynomial/include/CGAL/Polynomial_traits_d.h
View File

@ -325,7 +325,7 @@ public:
typedef Null_functor Pseudo_division_quotient; typedef Null_functor Pseudo_division_quotient;
struct Gcd_up_to_constant_factor struct Gcd_up_to_constant_factor
: public std::binary_function< ICoeff, ICoeff, ICoeff >{ : public CGAL::binary_function< ICoeff, ICoeff, ICoeff >{
ICoeff operator()(const ICoeff& x, const ICoeff& y) const { ICoeff operator()(const ICoeff& x, const ICoeff& y) const {
if (CGAL::is_zero(x) && CGAL::is_zero(y)) if (CGAL::is_zero(x) && CGAL::is_zero(y))
return ICoeff(0); return ICoeff(0);
@ -364,7 +364,7 @@ public:
}; };
struct Get_innermost_coefficient struct Get_innermost_coefficient
: public std::binary_function< ICoeff, Polynomial_d, Exponent_vector > { : public CGAL::binary_function< ICoeff, Polynomial_d, Exponent_vector > {
const ICoeff& operator()( const Polynomial_d& p, Exponent_vector ) { const ICoeff& operator()( const Polynomial_d& p, Exponent_vector ) {
return p; return p;
} }
@ -471,7 +471,7 @@ private:
// coeff type has no comparison operators available. // coeff type has no comparison operators available.
private: private:
struct Compare_exponents_coeff_pair struct Compare_exponents_coeff_pair
: public std::binary_function< : public CGAL::binary_function<
std::pair< Exponent_vector, Innermost_coefficient_type >, std::pair< Exponent_vector, Innermost_coefficient_type >,
std::pair< Exponent_vector, Innermost_coefficient_type >, std::pair< Exponent_vector, Innermost_coefficient_type >,
bool > bool >
@ -697,7 +697,7 @@ public:
// Get_coefficient; // Get_coefficient;
struct Get_coefficient struct Get_coefficient
: public std::binary_function<Polynomial_d, int, Coefficient_type > { : public CGAL::binary_function<Polynomial_d, int, Coefficient_type > {
const Coefficient_type& operator()( const Polynomial_d& p, int i) const { const Coefficient_type& operator()( const Polynomial_d& p, int i) const {
static const Coefficient_type zero = Coefficient_type(0); static const Coefficient_type zero = Coefficient_type(0);
@ -712,7 +712,7 @@ public:
// Get_innermost_coefficient; // Get_innermost_coefficient;
struct Get_innermost_coefficient struct Get_innermost_coefficient
: public : public
std::binary_function< Polynomial_d, Exponent_vector, Innermost_coefficient_type > CGAL::binary_function< Polynomial_d, Exponent_vector, Innermost_coefficient_type >
{ {
const Innermost_coefficient_type& const Innermost_coefficient_type&
@ -927,7 +927,7 @@ public:
// Evaluate; // Evaluate;
struct Evaluate struct Evaluate
:public std::binary_function<Polynomial_d,Coefficient_type,Coefficient_type>{ :public CGAL::binary_function<Polynomial_d,Coefficient_type,Coefficient_type>{
// Evaluate with respect to one variable // Evaluate with respect to one variable
Coefficient_type Coefficient_type
operator()(const Polynomial_d& p, const Coefficient_type& x) const { operator()(const Polynomial_d& p, const Coefficient_type& x) const {
@ -1124,7 +1124,7 @@ struct Construct_innermost_coefficient_const_iterator_range
}; };
struct Pseudo_division_quotient struct Pseudo_division_quotient
:public std::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> { :public CGAL::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> {
Polynomial_d Polynomial_d
operator()(const Polynomial_d& f, const Polynomial_d& g) const { operator()(const Polynomial_d& f, const Polynomial_d& g) const {
@ -1136,7 +1136,7 @@ struct Construct_innermost_coefficient_const_iterator_range
}; };
struct Pseudo_division_remainder struct Pseudo_division_remainder
:public std::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> { :public CGAL::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> {
Polynomial_d Polynomial_d
operator()(const Polynomial_d& f, const Polynomial_d& g) const { operator()(const Polynomial_d& f, const Polynomial_d& g) const {
@ -1148,7 +1148,7 @@ struct Construct_innermost_coefficient_const_iterator_range
}; };
struct Gcd_up_to_constant_factor struct Gcd_up_to_constant_factor
:public std::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> { :public CGAL::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> {
Polynomial_d Polynomial_d
operator()(const Polynomial_d& p, const Polynomial_d& q) const { operator()(const Polynomial_d& p, const Polynomial_d& q) const {
if(p==q) return CGAL::canonicalize(p); if(p==q) return CGAL::canonicalize(p);
@ -1165,7 +1165,7 @@ struct Construct_innermost_coefficient_const_iterator_range
}; };
struct Integral_division_up_to_constant_factor struct Integral_division_up_to_constant_factor
:public std::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> { :public CGAL::binary_function<Polynomial_d, Polynomial_d, Polynomial_d> {
@ -1269,7 +1269,7 @@ struct Construct_innermost_coefficient_const_iterator_range
}; };
struct Shift struct Shift
: public std::binary_function< Polynomial_d,int,Polynomial_d >{ : public CGAL::binary_function< Polynomial_d,int,Polynomial_d >{
Polynomial_d Polynomial_d
operator()(const Polynomial_d& p, int e, int i = (d-1)) const { operator()(const Polynomial_d& p, int e, int i = (d-1)) const {
@ -1319,7 +1319,7 @@ struct Construct_innermost_coefficient_const_iterator_range
}; };
struct Translate struct Translate
: public std::binary_function< Polynomial_d , Innermost_coefficient_type, : public CGAL::binary_function< Polynomial_d , Innermost_coefficient_type,
Polynomial_d >{ Polynomial_d >{
Polynomial_d Polynomial_d
operator()( operator()(
@ -1364,7 +1364,7 @@ struct Construct_innermost_coefficient_const_iterator_range
struct Scale struct Scale
: public : public
std::binary_function< Polynomial_d, Innermost_coefficient_type, Polynomial_d > { CGAL::binary_function< Polynomial_d, Innermost_coefficient_type, Polynomial_d > {
Polynomial_d operator()( Polynomial_d p, const Innermost_coefficient_type& c, Polynomial_d operator()( Polynomial_d p, const Innermost_coefficient_type& c,
int i = (PT::d-1) ) const { int i = (PT::d-1) ) const {
@ -1410,7 +1410,7 @@ struct Construct_innermost_coefficient_const_iterator_range
}; };
struct Resultant struct Resultant
: public std::binary_function<Polynomial_d, Polynomial_d, Coefficient_type>{ : public CGAL::binary_function<Polynomial_d, Polynomial_d, Coefficient_type>{
Coefficient_type Coefficient_type
operator()( operator()(

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

@ -407,7 +407,7 @@ 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 std::binary_function< typename Op2::first_argument_type, : public CGAL::binary_function< typename Op2::first_argument_type,
typename Op2::second_argument_type, typename Op2::second_argument_type,
typename Op1::result_type > typename Op1::result_type >
{ {
@ -434,7 +434,7 @@ compose1_2(const Op1& op1, const Op2& op2)
template < class Op1, class Op2, class Op3 > template < class Op1, class Op2, class Op3 >
class Binary_compose_2 class Binary_compose_2
: public std::binary_function< typename Op2::argument_type, : public CGAL::binary_function< typename Op2::argument_type,
typename Op3::argument_type, typename Op3::argument_type,
typename Op1::result_type > typename Op1::result_type >
{ {

2
Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_2.h
View File

@ -279,7 +279,7 @@ public:
}; };
class Compare class Compare
: public std::binary_function< Real_embeddable, : public CGAL::binary_function< Real_embeddable,
Real_embeddable, Real_embeddable,
CGAL::Comparison_result >{ CGAL::Comparison_result >{
public: public:

6
Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h
View File

@ -32,7 +32,7 @@ namespace internal {
template <class K, int x> template <class K, int x>
struct Hilbert_cmp_2<K,x,true> struct Hilbert_cmp_2<K,x,true>
: public std::binary_function<typename K::Point_2, : public CGAL::binary_function<typename K::Point_2,
typename K::Point_2, bool> typename K::Point_2, bool>
{ {
typedef typename K::Point_2 Point; typedef typename K::Point_2 Point;
@ -46,7 +46,7 @@ namespace internal {
template <class K> template <class K>
struct Hilbert_cmp_2<K,0,false> struct Hilbert_cmp_2<K,0,false>
: public std::binary_function<typename K::Point_2, : public CGAL::binary_function<typename K::Point_2,
typename K::Point_2, bool> typename K::Point_2, bool>
{ {
typedef typename K::Point_2 Point; typedef typename K::Point_2 Point;
@ -60,7 +60,7 @@ namespace internal {
template <class K> template <class K>
struct Hilbert_cmp_2<K,1,false> struct Hilbert_cmp_2<K,1,false>
: public std::binary_function<typename K::Point_2, : public CGAL::binary_function<typename K::Point_2,
typename K::Point_2, bool> typename K::Point_2, bool>
{ {
typedef typename K::Point_2 Point; typedef typename K::Point_2 Point;

8
Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h
View File

@ -32,7 +32,7 @@ namespace internal {
template <class K, int x> template <class K, int x>
struct Hilbert_cmp_3<K,x,true> struct Hilbert_cmp_3<K,x,true>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;
@ -46,7 +46,7 @@ namespace internal {
template <class K> template <class K>
struct Hilbert_cmp_3<K,0,false> struct Hilbert_cmp_3<K,0,false>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;
@ -60,7 +60,7 @@ namespace internal {
template <class K> template <class K>
struct Hilbert_cmp_3<K,1,false> struct Hilbert_cmp_3<K,1,false>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;
@ -74,7 +74,7 @@ namespace internal {
template <class K> template <class K>
struct Hilbert_cmp_3<K,2,false> struct Hilbert_cmp_3<K,2,false>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;

2
Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h
View File

@ -33,7 +33,7 @@ namespace internal {
template <class K> template <class K>
struct Hilbert_cmp_d struct Hilbert_cmp_d
: public std::binary_function<typename K::Point_d, : public CGAL::binary_function<typename K::Point_d,
typename K::Point_d, bool> typename K::Point_d, bool>
{ {
typedef typename K::Point_d Point; typedef typename K::Point_d Point;

6
Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h
View File

@ -33,7 +33,7 @@ namespace internal {
template <class K, int x> template <class K, int x>
struct Fixed_hilbert_cmp_2<K,x,true> struct Fixed_hilbert_cmp_2<K,x,true>
: public std::binary_function<typename K::Point_2, : public CGAL::binary_function<typename K::Point_2,
typename K::Point_2, bool> typename K::Point_2, bool>
{ {
typedef typename K::Point_2 Point; typedef typename K::Point_2 Point;
@ -48,7 +48,7 @@ namespace internal {
template <class K> template <class K>
struct Fixed_hilbert_cmp_2<K,0,false> struct Fixed_hilbert_cmp_2<K,0,false>
: public std::binary_function<typename K::Point_2, : public CGAL::binary_function<typename K::Point_2,
typename K::Point_2, bool> typename K::Point_2, bool>
{ {
typedef typename K::Point_2 Point; typedef typename K::Point_2 Point;
@ -63,7 +63,7 @@ namespace internal {
template <class K> template <class K>
struct Fixed_hilbert_cmp_2<K,1,false> struct Fixed_hilbert_cmp_2<K,1,false>
: public std::binary_function<typename K::Point_2, : public CGAL::binary_function<typename K::Point_2,
typename K::Point_2, bool> typename K::Point_2, bool>
{ {
typedef typename K::Point_2 Point; typedef typename K::Point_2 Point;

8
Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h
View File

@ -32,7 +32,7 @@ namespace internal {
template <class K, int x> template <class K, int x>
struct Fixed_hilbert_cmp_3<K,x,true> struct Fixed_hilbert_cmp_3<K,x,true>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;
@ -47,7 +47,7 @@ namespace internal {
template <class K> template <class K>
struct Fixed_hilbert_cmp_3<K,0,false> struct Fixed_hilbert_cmp_3<K,0,false>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;
@ -62,7 +62,7 @@ namespace internal {
template <class K> template <class K>
struct Fixed_hilbert_cmp_3<K,1,false> struct Fixed_hilbert_cmp_3<K,1,false>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;
@ -77,7 +77,7 @@ namespace internal {
template <class K> template <class K>
struct Fixed_hilbert_cmp_3<K,2,false> struct Fixed_hilbert_cmp_3<K,2,false>
: public std::binary_function<typename K::Point_3, : public CGAL::binary_function<typename K::Point_3,
typename K::Point_3, bool> typename K::Point_3, bool>
{ {
typedef typename K::Point_3 Point; typedef typename K::Point_3 Point;

2
Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h
View File

@ -32,7 +32,7 @@ namespace internal {
template <class K> template <class K>
struct Fixed_hilbert_cmp_d struct Fixed_hilbert_cmp_d
: public std::binary_function<typename K::Point_d, : public CGAL::binary_function<typename K::Point_d,
typename K::Point_d, bool> typename K::Point_d, bool>
{ {
typedef typename K::Point_d Point; typedef typename K::Point_d Point;

4
Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
View File

@ -212,7 +212,7 @@ private :
typedef std::vector<MultinodePtr> MultinodeVector ; typedef std::vector<MultinodePtr> MultinodeVector ;
struct Halfedge_ID_compare : std::binary_function<bool,Halfedge_handle,Halfedge_handle> struct Halfedge_ID_compare : CGAL::binary_function<bool,Halfedge_handle,Halfedge_handle>
{ {
bool operator() ( Halfedge_handle const& aA, Halfedge_handle const& aB ) const bool operator() ( Halfedge_handle const& aA, Halfedge_handle const& aB ) const
{ {
@ -229,7 +229,7 @@ public:
private : private :
class Event_compare : public std::binary_function<bool,EventPtr,EventPtr> class Event_compare : public CGAL::binary_function<bool,EventPtr,EventPtr>
{ {
public: public:

6
Surface_mesher/demo/Surface_mesher/volume.cpp
View File

@ -61,7 +61,7 @@ class Classify_from_isovalue_list :
boost::shared_ptr<Isovalues> isovalues; boost::shared_ptr<Isovalues> isovalues;
bool is_identity; bool is_identity;
struct Sort_isovalues : std::binary_function<Isovalue, Isovalue, bool> struct Sort_isovalues : CGAL::binary_function<Isovalue, Isovalue, bool>
{ {
bool operator()(const Isovalue& isoval1, const Isovalue& isoval2) bool operator()(const Isovalue& isoval1, const Isovalue& isoval2)
{ {
@ -110,7 +110,7 @@ public:
}; };
class Generate_surface_identifiers : class Generate_surface_identifiers :
public std::binary_function<Classify_from_isovalue_list::result_type, public CGAL::binary_function<Classify_from_isovalue_list::result_type,
Classify_from_isovalue_list::result_type, Classify_from_isovalue_list::result_type,
const QTreeWidgetItem*> const QTreeWidgetItem*>
{ {
@ -143,7 +143,7 @@ public:
// typedef std::vector<Isovalue> Isovalues; // typedef std::vector<Isovalue> Isovalues;
// boost::shared_ptr<Isovalues> isovalues; // boost::shared_ptr<Isovalues> isovalues;
// struct Sort_isovalues : std::binary_function<Isovalue, Isovalue, bool> // struct Sort_isovalues : CGAL::binary_function<Isovalue, Isovalue, bool>
// { // {
// bool operator()(const Isovalue& isoval1, const Isovalue& isoval2) // bool operator()(const Isovalue& isoval1, const Isovalue& isoval2)
// { // {

2
Surface_mesher/include/CGAL/Surface_mesher/Implicit_surface_oracle_3.h
View File

@ -104,7 +104,7 @@ namespace CGAL {
namespace { namespace {
template <typename T> template <typename T>
struct Return_min : std::binary_function<T, T, T> struct Return_min : CGAL::binary_function<T, T, T>
{ {
T operator()(const T& a, const T& b) const T operator()(const T& a, const T& b) const
{ {

2
Triangulation_2/include/CGAL/Constrained_triangulation_2.h
View File

@ -401,7 +401,7 @@ insert_constraint(Vertex_handle vaa, Vertex_handle vbb, OutputIterator out)
class Less_edge class Less_edge
: public std::binary_function<Edge, Edge, bool> : public CGAL::binary_function<Edge, Edge, bool>
{ {
public: public:
Less_edge() {} Less_edge() {}

8
Visibility_2/include/CGAL/Rotational_sweep_visibility_2.h
View File

@ -72,7 +72,7 @@ private:
typedef Halfedge_const_handle EH; typedef Halfedge_const_handle EH;
typedef std::vector<EH> EHs; typedef std::vector<EH> EHs;
class Less_edge: public std::binary_function<EH, EH, bool> { class Less_edge: public CGAL::binary_function<EH, EH, bool> {
const Geometry_traits_2* geom_traits; const Geometry_traits_2* geom_traits;
public: public:
Less_edge() {} Less_edge() {}
@ -93,7 +93,7 @@ private:
} }
}; };
class Less_vertex: public std::binary_function<VH, VH, bool> { class Less_vertex: public CGAL::binary_function<VH, VH, bool> {
const Geometry_traits_2* geom_traits; const Geometry_traits_2* geom_traits;
public: public:
Less_vertex() {} Less_vertex() {}
@ -109,7 +109,7 @@ private:
} }
}; };
class Closer_edge: public std::binary_function<EH, EH, bool> { class Closer_edge: public CGAL::binary_function<EH, EH, bool> {
const Geometry_traits_2* geom_traits; const Geometry_traits_2* geom_traits;
Point_2 q; Point_2 q;
public: public:
@ -723,7 +723,7 @@ private:
//functor to decide which vertex is swept earlier by the rotational sweeping //functor to decide which vertex is swept earlier by the rotational sweeping
//ray //ray
class Is_swept_earlier:public std::binary_function<VH, VH, bool> { class Is_swept_earlier:public CGAL::binary_function<VH, VH, bool> {
const Point_2& q; const Point_2& q;
const Geometry_traits_2* geom_traits; const Geometry_traits_2* geom_traits;
public: public: