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

Replace all std::unary_function by CGAL::unary_function

This commit is contained in:
Laurent Rineau 2017-10-04 15:57:09 +02:00
parent 808c75027c
commit 7e9f756935
114 changed files with 511 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Advancing_front_surface_reconstruction/include/CGAL/Advancing_front_surface_reconstruction.h
View File

@ -2311,7 +2311,7 @@ namespace CGAL {
}
struct Remove : public std::unary_function<Vertex_handle, bool>
struct Remove : public CGAL::unary_function<Vertex_handle, bool>
{
Extract& E;
@ -2449,7 +2449,7 @@ namespace CGAL {
namespace AFSR {
template <typename T>
struct Auto_count : public std::unary_function<const T&,std::pair<T,std::size_t> >{
struct Auto_count : public CGAL::unary_function<const T&,std::pair<T,std::size_t> >{
mutable std::size_t i;
Auto_count()
@ -2462,7 +2462,7 @@ namespace CGAL {
};
template <typename T, typename CC>
struct Auto_count_cc : public std::unary_function<const T&,std::pair<T,std::size_t> >{
struct Auto_count_cc : public CGAL::unary_function<const T&,std::pair<T,std::size_t> >{
mutable std::size_t i;
CC cc;

5
Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h
View File

@ -29,7 +29,6 @@
#define CGAL_ALGEBRAIC_NUMBER_TRAITS_H 1
#include <numeric> // for std::accumulate
#include <functional> // for std::unary_function
#include <CGAL/tags.h>
#include <CGAL/Algebraic_structure_traits.h>
@ -47,7 +46,7 @@ public:
//! computes the factor which normalizes a number to be integral after
// multiplication
class Normalization_factor
: public std::unary_function<Type,Type> {
: public CGAL::unary_function<Type,Type> {
private:
static Type
normalization_factor(const Type&,Integral_domain_without_division_tag){
@ -68,7 +67,7 @@ public:
};
class Denominator_for_algebraic_integers
: public std::unary_function<Type,Type> {
: public CGAL::unary_function<Type,Type> {
public:
//! determine normalization factor
Type operator () (const Type&) {

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

@ -111,7 +111,7 @@ class Algebraic_structure_traits_base< Type_, Null_tag > {
// does nothing by default
class Simplify
: public std::unary_function< Type&, void > {
: public CGAL::unary_function< Type&, void > {
public:
void operator()( Type& ) const {}
};
@ -150,7 +150,7 @@ class Algebraic_structure_traits_base< Type_,
// returns Type(1) by default
class Unit_part
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return( x < Type(0)) ?
@ -159,7 +159,7 @@ class Algebraic_structure_traits_base< Type_,
};
class Square
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return x*x;
@ -167,7 +167,7 @@ class Algebraic_structure_traits_base< Type_,
};
class Is_zero
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
return x == Type(0);
@ -175,7 +175,7 @@ class Algebraic_structure_traits_base< Type_,
};
class Is_one
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
return x == Type(1);
@ -447,7 +447,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
// returns the argument \a a by default
class Unit_part
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return( x == Type(0)) ? Type(1) : x;
@ -474,7 +474,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
// maps to \c 1/x by default.
class Inverse
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return Type(1)/x;

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

@ -36,7 +36,7 @@ struct Is_zero_selector{ typedef AST_is_zero Type; };
template< class T >
struct Is_zero_selector< T, Null_functor >
{
struct Type : public std::unary_function< T, bool >{
struct Type : public CGAL::unary_function< T, bool >{
bool operator()( const T& x ) const {
return x == T(0);
}
@ -80,7 +80,7 @@ public:
Is_zero;
//! The generic \c Is_finite functor returns true
class Is_finite : public std::unary_function< Type, Boolean > {
class Is_finite : public CGAL::unary_function< Type, Boolean > {
public:
Boolean operator()( const Type& ) const {
return true;
@ -90,7 +90,7 @@ public:
//! The generic \c Abs functor implementation
//! uses one comparisons and the unary minus if necessary.
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
//! the function call.
Type operator()( const Type& x ) const {
@ -100,7 +100,7 @@ public:
//! The generic \c Sgn functor implementation uses two comparisons.
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
//! the function call.
::CGAL::Sign operator()( const Type& x ) const {
@ -114,7 +114,7 @@ public:
//! The generic \c Is_positive functor implementation uses one comparison.
class Is_positive
: public std::unary_function< Type, Boolean > {
: public CGAL::unary_function< Type, Boolean > {
public:
//! the function call.
Boolean operator()( const Type& x ) const {
@ -124,7 +124,7 @@ public:
//! The generic \c Is_negative functor implementation uses one comparison.
class Is_negative
: public std::unary_function< Type, Boolean > {
: public CGAL::unary_function< Type, Boolean > {
public:
//! the function call.
Boolean operator()( const Type& x ) const {
@ -151,7 +151,7 @@ public:
Comparison_result )
};
class To_double : public std::unary_function< Type, double > {
class To_double : public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return static_cast<double>(x);
@ -159,7 +159,7 @@ public:
};
class To_interval
: public std::unary_function< Type, std::pair<double,double> > {
: public CGAL::unary_function< Type, std::pair<double,double> > {
public:
std::pair<double,double> operator()( const Type& x ) const {
double dx(static_cast<double>(x));

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

@ -193,7 +193,7 @@ protected:
//! polynomial canonicalizer, needed for the cache
template <class Poly>
struct Poly_canonicalizer : public std::unary_function< Poly, Poly >
struct Poly_canonicalizer : public CGAL::unary_function< Poly, Poly >
{
// use Polynomial_traits_d<>::Canonicalize ?
Poly operator()(Poly p)
@ -349,7 +349,7 @@ public:
// Composition of two unary functors
template<typename InnerFunctor,typename OuterFunctor>
class Unary_compose
: public std::unary_function<typename InnerFunctor::argument_type,
: public CGAL::unary_function<typename InnerFunctor::argument_type,
typename OuterFunctor::result_type> {
public:
@ -412,7 +412,7 @@ public:
* when appropriate
*/
class Construct_curve_2 :
public std::unary_function< Polynomial_2, Curve_analysis_2 > {
public CGAL::unary_function< Polynomial_2, Curve_analysis_2 > {
public:
@ -629,7 +629,7 @@ public:
class Compute_polynomial_x_2 :
public std::unary_function<Algebraic_real_2, Polynomial_1> {
public CGAL::unary_function<Algebraic_real_2, Polynomial_1> {
public:
@ -649,7 +649,7 @@ public:
compute_polynomial_x_2_object);
class Compute_polynomial_y_2 :
public std::unary_function<Algebraic_real_2, Polynomial_1> {
public CGAL::unary_function<Algebraic_real_2, Polynomial_1> {
public:
@ -880,7 +880,7 @@ public:
//! returns the x-coordinate of an \c Algebraic_real_2 object
class Compute_x_2 :
public std::unary_function<Algebraic_real_2, Algebraic_real_1> {
public CGAL::unary_function<Algebraic_real_2, Algebraic_real_1> {
public:
@ -915,7 +915,7 @@ public:
* return approximation of the y-coordinate.
*/
class Compute_y_2 :
public std::unary_function<Algebraic_real_2, Algebraic_real_1> {
public CGAL::unary_function<Algebraic_real_2, Algebraic_real_1> {
public:
@ -1500,7 +1500,7 @@ public:
* the polynomial \c p is square free.
*/
class Has_finite_number_of_self_intersections_2 :
public std::unary_function< Polynomial_2, bool > {
public CGAL::unary_function< Polynomial_2, bool > {
public:
@ -1713,7 +1713,7 @@ public:
//! Non-Algebraic name
typedef Algebraic_real_2 Coordinate_2;
class Is_square_free_2 : public std::unary_function<Polynomial_2,bool> {
class Is_square_free_2 : public CGAL::unary_function<Polynomial_2,bool> {
public:
@ -1735,7 +1735,7 @@ public:
typedef Has_finite_number_of_intersections_2 Is_coprime_2;
CGAL_Algebraic_Kernel_cons(Is_coprime_2, is_coprime_2_object);
class Make_square_free_2 : public std::unary_function<Polynomial_2,
class Make_square_free_2 : public CGAL::unary_function<Polynomial_2,
Polynomial_2> {
public:
@ -2593,7 +2593,7 @@ public:
//! Refines the x-coordinate of an Algebraic_real_2 object
class Refine_x_2 :
public std::unary_function<Algebraic_real_2, void> {
public CGAL::unary_function<Algebraic_real_2, void> {
public:
@ -2617,7 +2617,7 @@ public:
CGAL_Algebraic_Kernel_pred(Refine_x_2, refine_x_2_object);
class Refine_y_2 :
public std::unary_function<Algebraic_real_2, void> {
public CGAL::unary_function<Algebraic_real_2, void> {
public:

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

@ -413,7 +413,7 @@ public:
};
class Sgn
: public std::unary_function< Type, CGAL::Sign > {
: public CGAL::unary_function< Type, CGAL::Sign > {
public:
CGAL::Sign operator()( const Type& a ) const {
return a.compare( Rational(0) );
@ -421,7 +421,7 @@ public:
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()(const Type& a) const {
return a.to_double();
@ -429,7 +429,7 @@ public:
};
class To_interval
: public std::unary_function< Type, std::pair<double, double> > {
: public CGAL::unary_function< Type, std::pair<double, double> > {
public:
typename std::pair<double, double> operator()(const Type& a) const {
return a.to_interval();

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

@ -49,7 +49,7 @@ template <typename Coefficient_> struct Bitstream_coefficient_kernel {
return Is_zero();
}
struct Convert_to_bfi : public std::unary_function
struct Convert_to_bfi : public CGAL::unary_function
<Coefficient,Bigfloat_interval> {
Bigfloat_interval operator() (Coefficient c) const {

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel_at_alpha.h
View File

@ -117,7 +117,7 @@ public:
//! \name Functors
//! @{
struct Is_zero : public std::unary_function<Coefficient,bool> {
struct Is_zero : public CGAL::unary_function<Coefficient,bool> {
Is_zero(Algebraic_kernel_d_1* kernel,Algebraic_real_1 alpha)
: _m_kernel(kernel),_m_alpha(alpha) {}
@ -137,7 +137,7 @@ public:
}
struct Convert_to_bfi
: public std::unary_function<Coefficient,Bigfloat_interval> {
: public CGAL::unary_function<Coefficient,Bigfloat_interval> {
Convert_to_bfi(Algebraic_kernel_d_1* kernel,
Algebraic_real_1 alpha)

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

@ -65,7 +65,7 @@ template<>
class Float_traits< leda_bigfloat > {
public:
struct Get_mantissa
: public std::unary_function< leda_bigfloat, leda_integer > {
: public CGAL::unary_function< leda_bigfloat, leda_integer > {
leda_integer operator()( const leda_bigfloat& x ) const {
//std::cout << x.get_significant() << std::endl;
return x.get_significant();
@ -73,7 +73,7 @@ public:
};
struct Get_exponent
: public std::unary_function< leda_bigfloat, long > {
: public CGAL::unary_function< leda_bigfloat, long > {
long operator()( const leda_bigfloat& x ) const {
return x.get_exponent().to_long();
}
@ -97,14 +97,14 @@ class Float_traits< CORE::BigFloat > {
public:
struct Get_mantissa
: public std::unary_function< CORE::BigFloat, CORE::BigInt > {
: public CGAL::unary_function< CORE::BigFloat, CORE::BigInt > {
CORE::BigInt operator()( const CORE::BigFloat& x ) const {
return x.m();
}
};
struct Get_exponent
: public std::unary_function< CORE::BigFloat, long > {
: public CGAL::unary_function< CORE::BigFloat, long > {
long operator()( const CORE::BigFloat& x ) const {
return CORE::CHUNK_BIT*x.exp(); // The basis is 2^CORE::CHUNK_BIT
}
@ -126,7 +126,7 @@ public:
template<> class Float_traits< Gmpfr > {
struct Get_mantissa_exponent
: public std::unary_function< Gmpfr, std::pair<Gmpz,long> > {
: public CGAL::unary_function< Gmpfr, std::pair<Gmpz,long> > {
std::pair<Gmpz,long> operator()( const Gmpfr& x ) const {
return x.to_integer_exp();
@ -134,14 +134,14 @@ template<> class Float_traits< Gmpfr > {
};
public:
struct Get_mantissa
: public std::unary_function< Gmpfr, Gmpz > {
: public CGAL::unary_function< Gmpfr, Gmpz > {
Gmpz operator()( const Gmpfr& x ) const {
return Get_mantissa_exponent()(x).first;
}
};
struct Get_exponent
: public std::unary_function< Gmpfr, long > {
: public CGAL::unary_function< Gmpfr, long > {
long operator()( const Gmpfr& x ) const {
return Get_mantissa_exponent()(x).second;
}

72
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h
View File

@ -102,7 +102,7 @@ template<>
class Real_embeddable_extension< long > {
public:
struct Ceil_log2_abs
: public std::unary_function< long, long > {
: public CGAL::unary_function< long, long > {
long operator()( long x ) {
if (x < 0) x = -x;
CGAL_precondition(x > 0);
@ -112,7 +112,7 @@ public:
};
struct Floor_log2_abs
: public std::unary_function< long, long > {
: public CGAL::unary_function< long, long > {
private:
signed char floor_log2_4bit[16];
public:
@ -148,11 +148,11 @@ public:
};
struct Floor
: public std::unary_function< long, long > {
: public CGAL::unary_function< long, long > {
long operator() (long x) { return x;}
};
struct Ceil
: public std::unary_function< long, long > {
: public CGAL::unary_function< long, long > {
long operator() (long x) { return x;}
};
};
@ -167,7 +167,7 @@ public:
typedef leda_integer Type;
struct Ceil_log2_abs
: public std::unary_function< leda_integer, long > {
: public CGAL::unary_function< leda_integer, long > {
long operator()( const leda_integer& x ) const {
CGAL_precondition(x != leda_integer(0));
::leda::digit_sz ldgzeros = ::leda::digLeadingZeros(x.highword());
@ -187,7 +187,7 @@ public:
};
struct Floor_log2_abs
: public std::unary_function< leda_integer, long > {
: public CGAL::unary_function< leda_integer, long > {
long operator()( const leda_integer& x ) const {
CGAL_precondition(x != leda_integer(0));
::leda::digit_sz ldgzeros
@ -199,11 +199,11 @@ public:
};
struct Floor
: public std::unary_function< leda_integer, leda_integer > {
: public CGAL::unary_function< leda_integer, leda_integer > {
leda_integer operator() (const leda_integer& x) const { return x;}
};
struct Ceil
: public std::unary_function< leda_integer, leda_integer > {
: public CGAL::unary_function< leda_integer, leda_integer > {
leda_integer operator() (const leda_integer& x) const { return x;}
};
};
@ -215,7 +215,7 @@ public:
typedef leda_bigfloat Type;
struct Floor_log2_abs
: public std::unary_function< leda_bigfloat, long > {
: public CGAL::unary_function< leda_bigfloat, long > {
long operator()( const leda_bigfloat& x ) const {
CGAL_precondition(CGAL::sign(x) != CGAL::ZERO);
::leda::integer abs_sign = abs(x.get_significant());
@ -225,7 +225,7 @@ public:
};
struct Ceil_log2_abs
: public std::unary_function< leda_bigfloat, long > {
: public CGAL::unary_function< leda_bigfloat, long > {
long operator()( const leda_bigfloat& x ) const {
CGAL_precondition(CGAL::sign(x) != CGAL::ZERO);
return ::leda::ilog2(x).to_long();
@ -233,14 +233,14 @@ public:
};
struct Floor
: public std::unary_function< leda_bigfloat, leda_integer > {
: public CGAL::unary_function< leda_bigfloat, leda_integer > {
leda_integer operator() ( const leda_bigfloat& x ) const {
return leda::to_integer( x, leda::TO_N_INF );
}
};
struct Ceil
: public std::unary_function< leda_bigfloat, leda_integer > {
: public CGAL::unary_function< leda_bigfloat, leda_integer > {
leda_integer operator() ( const leda_bigfloat& x ) const {
return leda::to_integer( x, leda::TO_P_INF );
}
@ -254,7 +254,7 @@ public:
typedef leda_bigfloat_interval Type;
struct Floor_log2_abs
: public std::unary_function< leda_bigfloat_interval, long > {
: public CGAL::unary_function< leda_bigfloat_interval, long > {
result_type operator() (const argument_type& x) const {
CGAL_precondition(! ::boost::numeric::in_zero(x));
@ -263,7 +263,7 @@ public:
};
struct Ceil_log2_abs
: public std::unary_function< leda_bigfloat_interval, long > {
: public CGAL::unary_function< leda_bigfloat_interval, long > {
long operator()( const leda_bigfloat_interval& x ) const {
CGAL_precondition(!(::boost::numeric::in_zero(x) &&
::boost::numeric::singleton(x)));
@ -272,7 +272,7 @@ public:
};
struct Floor
: public std::unary_function< leda_bigfloat_interval, leda_integer > {
: public CGAL::unary_function< leda_bigfloat_interval, leda_integer > {
leda_integer operator() ( const leda_bigfloat_interval& x )
const {
return internal::floor( x.lower() );
@ -280,7 +280,7 @@ public:
};
struct Ceil
: public std::unary_function< leda_bigfloat_interval, leda_integer > {
: public CGAL::unary_function< leda_bigfloat_interval, leda_integer > {
leda_integer operator() ( const leda_bigfloat_interval& x )
const {
return internal::ceil( x.upper() );
@ -298,27 +298,27 @@ class Real_embeddable_extension< CORE::BigInt > {
public:
typedef CORE::BigInt Type;
struct Floor_log2_abs
: public std::unary_function< CORE::BigInt, long > {
: public CGAL::unary_function< CORE::BigInt, long > {
long operator()( const CORE::BigInt& x ) const {
return CORE::floorLg(x);
}
};
struct Ceil_log2_abs
: public std::unary_function< CORE::BigInt, long > {
: public CGAL::unary_function< CORE::BigInt, long > {
long operator()( const CORE::BigInt& x ) const {
return CORE::ceilLg(x);
}
};
struct Floor
: public std::unary_function< CORE::BigInt, CORE::BigInt > {
: public CGAL::unary_function< CORE::BigInt, CORE::BigInt > {
CORE::BigInt operator() (const CORE::BigInt& x) const {
return x;
}
};
struct Ceil
: public std::unary_function< CORE::BigInt, CORE::BigInt > {
: public CGAL::unary_function< CORE::BigInt, CORE::BigInt > {
CORE::BigInt operator() (const CORE::BigInt& x) const {
return x;
}
@ -331,7 +331,7 @@ class Real_embeddable_extension< CORE::BigFloat > {
public:
typedef CORE::BigFloat Type;
struct Floor_log2_abs
: public std::unary_function< CORE::BigFloat, long > {
: public CGAL::unary_function< CORE::BigFloat, long > {
long operator()( CORE::BigFloat x ) const {
CGAL_precondition(!CGAL::zero_in(x));
x = CGAL::abs(x);
@ -340,7 +340,7 @@ public:
};
struct Ceil_log2_abs
: public std::unary_function< CORE::BigFloat, long > {
: public CGAL::unary_function< CORE::BigFloat, long > {
long operator()( CORE::BigFloat x ) const {
// (already commented out in EXACUS)...
// NiX_precond(!(NiX::in_zero(x) && NiX::singleton(x)));
@ -350,7 +350,7 @@ public:
};
struct Floor
: public std::unary_function< CORE::BigFloat, CORE::BigInt > {
: public CGAL::unary_function< CORE::BigFloat, CORE::BigInt > {
CORE::BigInt operator() ( const CORE::BigFloat& x ) const {
CORE::BigInt xi = x.BigIntValue();
if(x.sign() < 0 && x.cmp(xi)!=0) {
@ -361,7 +361,7 @@ public:
};
struct Ceil
: public std::unary_function< CORE::BigFloat, CORE::BigInt > {
: public CGAL::unary_function< CORE::BigFloat, CORE::BigInt > {
CORE::BigInt operator() ( const CORE::BigFloat& x ) const {
CORE::BigInt xi = x.BigIntValue();
if(x.sign() >0 && x.cmp(xi)!=0) {
@ -384,7 +384,7 @@ public:
typedef Gmpz Type;
struct Floor_log2_abs
: public std::unary_function< Gmpz, long > {
: public CGAL::unary_function< Gmpz, long > {
long operator()( const Gmpz& x ) const {
CGAL_precondition(!CGAL::is_zero(x));
return mpz_sizeinbase(x.mpz(),2)-1;
@ -392,7 +392,7 @@ public:
};
struct Ceil_log2_abs
: public std::unary_function< Gmpz, long > {
: public CGAL::unary_function< Gmpz, long > {
long operator()( const Gmpz& x ) const {
long pos = mpz_scan1(x.mpz(),0);
long size = mpz_sizeinbase(x.mpz(),2);
@ -404,13 +404,13 @@ public:
};
struct Floor
: public std::unary_function< Gmpz, Gmpz > {
: public CGAL::unary_function< Gmpz, Gmpz > {
Gmpz operator() (const Gmpz& x) const {
return x;
}
};
struct Ceil
: public std::unary_function< Gmpz, Gmpz > {
: public CGAL::unary_function< Gmpz, Gmpz > {
Gmpz operator() (const Gmpz& x) const {
return x;
}
@ -426,7 +426,7 @@ public:
typedef Gmpfr Type;
struct Floor_log2_abs
: public std::unary_function< Gmpfr, long > {
: public CGAL::unary_function< Gmpfr, long > {
long operator()( const Gmpfr& x ) const {
Float_traits<Gmpfr>::Get_mantissa get_mantissa;
Float_traits<Gmpfr>::Get_exponent get_exponent;
@ -437,7 +437,7 @@ public:
};
struct Ceil_log2_abs
: public std::unary_function< Gmpfr, long > {
: public CGAL::unary_function< Gmpfr, long > {
long operator()( const Gmpfr& x ) const {
Float_traits<Gmpfr>::Get_mantissa get_mantissa;
Float_traits<Gmpfr>::Get_exponent get_exponent;
@ -448,7 +448,7 @@ public:
};
struct Floor
: public std::unary_function< Gmpfr, Gmpz > {
: public CGAL::unary_function< Gmpfr, Gmpz > {
Gmpz operator() ( const Gmpfr& x ) const {
Gmpz result;
mpfr_get_z (result.mpz(),x.fr(),GMP_RNDD);
@ -457,7 +457,7 @@ public:
};
struct Ceil
: public std::unary_function< Gmpfr, Gmpz > {
: public CGAL::unary_function< Gmpfr, Gmpz > {
Gmpz operator() ( const Gmpfr& x ) const {
Gmpz result;
mpfr_get_z (result.mpz(),x.fr(),GMP_RNDU);
@ -475,7 +475,7 @@ public:
typedef Gmpfi Type;
struct Floor_log2_abs
: public std::unary_function< Gmpfi, long > {
: public CGAL::unary_function< Gmpfi, long > {
result_type operator() (const argument_type& x) const {
CGAL_precondition(!x.is_zero());
return internal::floor_log2_abs(x.abs().inf());
@ -483,7 +483,7 @@ public:
};
struct Ceil_log2_abs
: public std::unary_function< Gmpfi, long > {
: public CGAL::unary_function< Gmpfi, long > {
long operator()( const Gmpfi& x ) const {
CGAL_precondition(!x.inf().is_zero() || !x.sup().is_zero());
return internal::ceil_log2_abs(x.abs().sup());
@ -491,7 +491,7 @@ public:
};
struct Floor
: public std::unary_function< Gmpfi, Gmpz > {
: public CGAL::unary_function< Gmpfi, Gmpz > {
Gmpz operator() ( const Gmpfi& x )
const {
return internal::floor( x.inf() );
@ -499,7 +499,7 @@ public:
};
struct Ceil
: public std::unary_function< Gmpfi, Gmpz > {
: public CGAL::unary_function< Gmpfi, Gmpz > {
Gmpz operator() ( const Gmpfi& x )
const {
return internal::ceil( x.sup() );

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

@ -68,12 +68,12 @@ protected:
// Some functors used for STL calls
template<typename A,typename B>
struct Pair_first : public std::unary_function<std::pair<A,B>,A> {
struct Pair_first : public CGAL::unary_function<std::pair<A,B>,A> {
A operator() (std::pair<A,B> pair) const { return pair.first; }
};
template<typename A,typename B>
struct Pair_second : public std::unary_function<std::pair<A,B>,B> {
struct Pair_second : public CGAL::unary_function<std::pair<A,B>,B> {
B operator() (std::pair<A,B> pair) const { return pair.second; }
};
@ -96,21 +96,21 @@ public:
};
struct Lower_bound
: public std::unary_function< Type, Bound > {
: public CGAL::unary_function< Type, Bound > {
Bound operator()( const Type& t ) const {
return t.low();
}
};
struct Upper_bound
: public std::unary_function< Type, Bound > {
: public CGAL::unary_function< Type, Bound > {
Bound operator()( const Type& t ) const {
return t.high();
}
};
struct Refine
: public std::unary_function< Type, void > {
: public CGAL::unary_function< Type, void > {
void operator()( const Type& t ) const {
t.refine();
}
@ -333,7 +333,7 @@ public:
};
class Number_of_solutions_1
: public std::unary_function<Polynomial_1,size_type> {
: public CGAL::unary_function<Polynomial_1,size_type> {
public:
@ -382,7 +382,7 @@ public:
};
struct Is_square_free_1
: public std::unary_function< Polynomial_1, bool > {
: public CGAL::unary_function< Polynomial_1, bool > {
bool operator()( const Polynomial_1& p ) const {
typename CGAL::Polynomial_traits_d< Polynomial_1 >::Is_square_free isf;
return isf(p);
@ -400,7 +400,7 @@ public:
};
struct Make_square_free_1
: public std::unary_function< Polynomial_1, Polynomial_1 > {
: public CGAL::unary_function< Polynomial_1, Polynomial_1 > {
Polynomial_1 operator()( const Polynomial_1& p ) const {
return typename CGAL::Polynomial_traits_d< Polynomial_1 >::Make_square_free()( p );
}
@ -435,7 +435,7 @@ public:
}
};
struct Compute_polynomial_1 : public std::unary_function<Algebraic_real_1,
struct Compute_polynomial_1 : public CGAL::unary_function<Algebraic_real_1,
Polynomial_1> {
Polynomial_1 operator()(const Algebraic_real_1& x) const {
return x.polynomial();

12
Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h
View File

@ -258,39 +258,39 @@ public INTERN_RET::Real_embeddable_traits_base<
Base;
typedef typename Base::Compare Compare;
class Sgn:public std::unary_function<Type,CGAL::Sign>{
class Sgn:public CGAL::unary_function<Type,CGAL::Sign>{
public:
CGAL::Sign operator()(const Type &a)const{
return Compare()(a,Type(0));
}
};
class To_double:public std::unary_function<Type,double>{
class To_double:public CGAL::unary_function<Type,double>{
public:
double operator()(const Type &a)const{return a.to_double();}
};
class To_interval:
public std::unary_function<Type,std::pair<double,double> >{
public CGAL::unary_function<Type,std::pair<double,double> >{
public:
std::pair<double,double> operator()(const Type &a)const{
return a.to_interval();
}
};
class Is_zero:public std::unary_function<Type,Boolean>{
class Is_zero:public CGAL::unary_function<Type,Boolean>{
public:
bool operator()(const Type &a)const{
return Sgn()(a)==CGAL::ZERO;
}
};
class Is_finite:public std::unary_function<Type,Boolean>{
class Is_finite:public CGAL::unary_function<Type,Boolean>{
public:
bool operator()(const Type&)const{return true;}
};
class Abs:public std::unary_function<Type,Type>{
class Abs:public CGAL::unary_function<Type,Type>{
public:
Type operator()(const Type &a)const{
return Sgn()(a)==CGAL::NEGATIVE?-a:a;

12
Algebraic_kernel_d/include/CGAL/RS/algebraic_z_1.h
View File

@ -249,39 +249,39 @@ public INTERN_RET::Real_embeddable_traits_base<
Base;
typedef typename Base::Compare Compare;
class Sgn:public std::unary_function<Type,CGAL::Sign>{
class Sgn:public CGAL::unary_function<Type,CGAL::Sign>{
public:
CGAL::Sign operator()(const Type &a)const{
return Compare()(a,Type(0));
}
};
class To_double:public std::unary_function<Type,double>{
class To_double:public CGAL::unary_function<Type,double>{
public:
double operator()(const Type &a)const{return a.to_double();}
};
class To_interval:
public std::unary_function<Type,std::pair<double,double> >{
public CGAL::unary_function<Type,std::pair<double,double> >{
public:
std::pair<double,double> operator()(const Type &a)const{
return a.to_interval();
}
};
class Is_zero:public std::unary_function<Type,Boolean>{
class Is_zero:public CGAL::unary_function<Type,Boolean>{
public:
bool operator()(const Type &a)const{
return Sgn()(a)==CGAL::ZERO;
}
};
class Is_finite:public std::unary_function<Type,Boolean>{
class Is_finite:public CGAL::unary_function<Type,Boolean>{
public:
bool operator()(const Type&)const{return true;}
};
class Abs:public std::unary_function<Type,Type>{
class Abs:public CGAL::unary_function<Type,Type>{
public:
Type operator()(const Type &a)const{
return Sgn()(a)==CGAL::NEGATIVE?-a:a;

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

@ -60,7 +60,7 @@ struct Construct_algebraic_real_1{
template <class Polynomial_,class Algebraic_>
struct Compute_polynomial_1:
public std::unary_function<Algebraic_,Polynomial_>{
public CGAL::unary_function<Algebraic_,Polynomial_>{
typedef Polynomial_ Polynomial;
typedef Algebraic_ Algebraic;
Polynomial operator()(const Algebraic &x)const{
@ -442,7 +442,7 @@ public std::binary_function<Polynomial_,Algebraic_,bool>{
// programs assume that this is equal to int
template <class Polynomial_,class Isolator_>
struct Number_of_solutions_1:
public std::unary_function<Polynomial_,int>{
public CGAL::unary_function<Polynomial_,int>{
typedef Polynomial_ Polynomial_1;
typedef Isolator_ Isolator;
size_t operator()(const Polynomial_1 &p)const{

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

@ -68,7 +68,7 @@ struct Construct_algebraic_real_z_1{
template <class Polynomial_,class Algebraic_>
struct Compute_polynomial_z_1:
public std::unary_function<Algebraic_,Polynomial_>{
public CGAL::unary_function<Algebraic_,Polynomial_>{
typedef Polynomial_ Polynomial;
typedef Algebraic_ Algebraic;
Polynomial operator()(const Algebraic &x)const{
@ -482,7 +482,7 @@ template <class Polynomial_,
class PolConverter_,
class Isolator_>
struct Number_of_solutions_z_1:
public std::unary_function<Polynomial_,int>{
public CGAL::unary_function<Polynomial_,int>{
typedef Polynomial_ Polynomial_1;
typedef ZPolynomial_ ZPolynomial_1;
typedef PolConverter_ PolConverter;

2
Algebraic_kernel_d/include/CGAL/RS/polynomial_converter_1.h
View File

@ -26,7 +26,7 @@ namespace RS_AK1{
template <class InputPolynomial_,class OutputPolynomial_>
struct Polynomial_converter_1:
public std::unary_function<InputPolynomial_,OutputPolynomial_>{
public CGAL::unary_function<InputPolynomial_,OutputPolynomial_>{
typedef InputPolynomial_ InpPolynomial_1;
typedef OutputPolynomial_ OutPolynomial_1;
OutPolynomial_1 operator()(const InpPolynomial_1&)const;

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

@ -34,7 +34,7 @@ template < class Td_traits> class Trapezoidal_decomposition_2;
////MICHAL: not in use
//template <class map_item>
//struct Td_active_map_item : public std::unary_function<map_item,bool>
//struct Td_active_map_item : public CGAL::unary_function<map_item,bool>
//{
// bool operator()(const map_item& item) const
// {
@ -45,7 +45,7 @@ template < class Td_traits> class Trapezoidal_decomposition_2;
////MICHAL: not in use
//template <class X_trapezoid,class Traits>
//struct Td_active_non_degenerate_trapezoid :
//public std::unary_function<X_trapezoid,bool>
//public CGAL::unary_function<X_trapezoid,bool>
//{
// Td_active_non_degenerate_trapezoid(Traits& t) : traits(t) {}
// bool operator()(const X_trapezoid& tr) const
@ -58,7 +58,7 @@ template < class Td_traits> class Trapezoidal_decomposition_2;
template <class map_item,class Traits>
struct Td_active_edge_item:
public std::unary_function<map_item,bool>
public CGAL::unary_function<map_item,bool>
{
Td_active_edge_item(const Traits& t) : traits(t) {}
bool operator()(const map_item& item) const

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

@ -1043,7 +1043,7 @@ public:
//! \brief constructs \c Curve_analysis_2 object, uses caching if appropriate
struct Construct_curve_2 :
public std::unary_function< Polynomial_2, Curve_analysis_2 >
public CGAL::unary_function< Polynomial_2, Curve_analysis_2 >
{
//! \brief constructs an object from \c Algebraic_curve_kernel_2 type
//! no default constructor provided
@ -1080,7 +1080,7 @@ public:
//! returns the first coordinate of \c Xy_coordinate_2
struct Get_x_2 :
public std::unary_function<Xy_coordinate_2, Algebraic_real_1> {
public CGAL::unary_function<Xy_coordinate_2, Algebraic_real_1> {
Algebraic_real_1 operator()(const Xy_coordinate_2& xy) const {
return xy.x();
@ -1090,7 +1090,7 @@ public:
//! returns the second coordinate of \c Xy_coordinate_2
struct Get_y_2 :
public std::unary_function<Xy_coordinate_2, Algebraic_real_1> {
public CGAL::unary_function<Xy_coordinate_2, Algebraic_real_1> {
Algebraic_real_1 operator()(const Xy_coordinate_2& xy) const {
return xy.y();
@ -1099,7 +1099,7 @@ public:
CGAL_Algebraic_Kernel_cons(Get_y_2, Get_y_2_object);
struct Refine_x_2 :
public std::unary_function<Xy_coordinate_2, void> {
public CGAL::unary_function<Xy_coordinate_2, void> {
void operator()(const Xy_coordinate_2& r) const { }
@ -1108,7 +1108,7 @@ public:
CGAL_Algebraic_Kernel_pred(Refine_x_2, refine_x_2_object);
struct Refine_y_2 :
public std::unary_function<Xy_coordinate_2, void> {
public CGAL::unary_function<Xy_coordinate_2, void> {
void operator()(const Xy_coordinate_2& r) const { }
@ -1245,7 +1245,7 @@ public:
//! for algerbaic curves this means that supporting polynomial is
//! square-free
struct Has_finite_number_of_self_intersections_2 :
public std::unary_function< Polynomial_2, bool > {
public CGAL::unary_function< Polynomial_2, bool > {
bool operator()(const Polynomial_2& p) const {
return true; //is_square_free(p);
@ -1317,7 +1317,7 @@ public:
//! \brief computes the derivative w.r.t. the first (innermost) variable
struct Derivative_x_2 :
public std::unary_function< Polynomial_2, Polynomial_2 > {
public CGAL::unary_function< Polynomial_2, Polynomial_2 > {
Polynomial_2 operator()(const Polynomial_2& p) const {
return p;
@ -1327,7 +1327,7 @@ public:
//! \brief computes the derivative w.r.t. the first (outermost) variable
struct Derivative_y_2 :
public std::unary_function< Polynomial_2, Polynomial_2 > {
public CGAL::unary_function< Polynomial_2, Polynomial_2 > {
Polynomial_2 operator()(const Polynomial_2& p) const {
return p;

2
BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h
View File

@ -151,7 +151,7 @@ struct Graph_with_descriptor_with_graph
template <typename Graph, typename Graph_descriptor, typename Descriptor>
struct Descriptor2Descriptor: public std::unary_function<Graph_descriptor,Descriptor>
struct Descriptor2Descriptor: public CGAL::unary_function<Graph_descriptor,Descriptor>
{
Descriptor2Descriptor()

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

@ -94,7 +94,7 @@ namespace MA_detail {
// functor for a fixed column of A
template <class NT, class Iterator>
class A_column : public std::unary_function <int, NT>
class A_column : public CGAL::unary_function <int, NT>
{
public:
typedef NT result_type;
@ -132,7 +132,7 @@ namespace MA_detail {
// functor for matrix A
template <class NT, class Access_coordinate_begin_d,
class Point_iterator >
class A_matrix : public std::unary_function
class A_matrix : public CGAL::unary_function
<int, boost::transform_iterator <A_column
<NT, typename Access_coordinate_begin_d::Coordinate_iterator>,
boost::counting_iterator<int> > >
@ -166,7 +166,7 @@ namespace MA_detail {
// The functor necessary to realize access to b
template <class NT>
class B_vector : public std::unary_function<int, NT>
class B_vector : public CGAL::unary_function<int, NT>
{
public:
typedef NT result_type;

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

@ -256,7 +256,7 @@ public:
// new constructions
struct Construct_vector_from_direction_2
: public std::unary_function<Direction_2,Vector_2>
: public CGAL::unary_function<Direction_2,Vector_2>
{
Vector_2 operator()(const Direction_2& d) const { return d.vector(); }
};

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

@ -144,7 +144,7 @@ struct MyTraits {
}
};
struct Construct_vector_from_direction_2
: public std::unary_function<Direction_2,Vector_2>
: public CGAL::unary_function<Direction_2,Vector_2>
{
Vector_2 operator()(const Direction_2& d) const
{
@ -171,7 +171,7 @@ struct MyTraits {
}
};
struct Construct_direction_2
: public std::unary_function<Vector_2,Direction_2>
: public CGAL::unary_function<Vector_2,Direction_2>
{
Direction_2 operator()(const Vector_2& v) const
{
@ -182,7 +182,7 @@ struct MyTraits {
}
};
struct Construct_opposite_direction_2
: public std::unary_function<Direction_2,Direction_2>
: public CGAL::unary_function<Direction_2,Direction_2>
{
Direction_2 operator()(const Direction_2& d) const
{

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

@ -102,7 +102,7 @@ struct Predicate_traits_d : public BoxTraits {
};
// loless val dim box = getlo box dim < val
class Lo_less : public std::unary_function<Box_parameter,bool> {
class Lo_less : public CGAL::unary_function<Box_parameter,bool> {
NT value;
int dim;
public:
@ -112,7 +112,7 @@ struct Predicate_traits_d : public BoxTraits {
}
};
class Hi_greater : public std::unary_function<Box_parameter,bool> {
class Hi_greater : public CGAL::unary_function<Box_parameter,bool> {
NT value;
int dim;
public:
@ -123,7 +123,7 @@ struct Predicate_traits_d : public BoxTraits {
};
// spanning lo hi dim box = getlo box dim < lo && gethi box dim > hi
class Spanning : public std::unary_function<Box_parameter,bool> {
class Spanning : public CGAL::unary_function<Box_parameter,bool> {
NT lo, hi;
int dim;
public:

2
CGAL_ImageIO/include/CGAL/Image_3.h
View File

@ -49,7 +49,7 @@ namespace ImageIO {
template <typename T>
struct Indicator_factory
{
class Indicator : public std::unary_function<T, double>
class Indicator : public CGAL::unary_function<T, double>
{
const T label;
public:

6
Combinatorial_map/examples/Combinatorial_map/map_3_foreach.cpp
View File

@ -8,7 +8,7 @@ typedef CMap_3::Dart_handle Dart_handle;
// Functor used to display all the vertices of a given volume
template<class CMap, unsigned int i>
struct Display_vertices_of_cell : public std::unary_function<CMap, void>
struct Display_vertices_of_cell : public CGAL::unary_function<CMap, void>
{
Display_vertices_of_cell(const CMap& acmap) :
cmap(acmap),
@ -40,7 +40,7 @@ private:
// Functor used to remove a face
template<class CMap>
struct Remove_face : public std::unary_function<CMap, void>
struct Remove_face : public CGAL::unary_function<CMap, void>
{
Remove_face(CMap& acmap) : cmap(acmap)
{}
@ -60,7 +60,7 @@ private:
// Functor allowing to transform a variable into its address.
template<typename T>
struct Take_adress : public std::unary_function<T, T*>
struct Take_adress : public CGAL::unary_function<T, T*>
{
T* operator() (T& t) const
{ return &t; }

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

@ -40,7 +40,7 @@ typedef unspecified_type Scale;
/*!
function object class derived from
`std::unary_function<Point_2, FT>`
`CGAL::unary_function<Point_2, FT>`
*/
typedef unspecified_type Max_coordinate;

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

@ -45,7 +45,7 @@ struct Random_convex_set_traits_2 : public Kernel {
{ return _origin; }
struct Max_coordinate
: public std::unary_function< Point_2, FT >
: public CGAL::unary_function< Point_2, FT >
{
FT
operator()( const Point_2& p) const

2
Installation/include/CGAL/config.h
View File

@ -261,7 +261,7 @@
//----------------------------------------------------------------------//
// As std::unary_function is deprecated we unse internally CGAL::unary_function
// As CGAL::unary_function is deprecated we unse internally CGAL::unary_function
//----------------------------------------------------------------------//
#include <CGAL/unary_function.h>

2
Interpolation/doc/Interpolation/CGAL/interpolation_functions.h
View File

@ -20,7 +20,7 @@ The class
*/
template< typename Map >
struct Data_access : public std::unary_function< typename Map::key_type,
struct Data_access : public CGAL::unary_function< typename Map::key_type,
std::pair< typename Map::mapped_type, bool> > {
public:

2
Interpolation/include/CGAL/interpolation_functions.h
View File

@ -31,7 +31,7 @@ namespace CGAL {
//Functor class for accessing the function values/gradients
template< class Map >
struct Data_access
: public std::unary_function< typename Map::key_type,
: public CGAL::unary_function< typename Map::key_type,
std::pair< typename Map::mapped_type, bool> >
{
typedef typename Map::mapped_type Data_type;

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

@ -646,7 +646,7 @@ class Real_embeddable_traits< CGAL::POLYNOMIAL::internal::Simple_interval_root<T
public:
typedef CGAL::POLYNOMIAL::internal::Simple_interval_root<T> Type;
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
if (x < Type(0)) return -x;
@ -655,7 +655,7 @@ public:
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return static_cast<CGAL::Sign>(x.compare(0));
@ -677,7 +677,7 @@ public:
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
// this call is required to get reasonable values for the double
@ -687,7 +687,7 @@ public:
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {

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

@ -951,7 +951,7 @@ class Real_embeddable_traits< CGAL::POLYNOMIAL::internal::Sturm_root_rep<T,I> >
public:
typedef CGAL::POLYNOMIAL::internal::Sturm_root_rep<T,I> Type;
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
if (x < Type(0)) return -x;
@ -960,7 +960,7 @@ public:
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return static_cast<CGAL::Sign>(x.compare(0));
@ -982,7 +982,7 @@ public:
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
// this call is required to get reasonable values for the double
@ -992,7 +992,7 @@ public:
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {

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

@ -259,7 +259,7 @@ template <class A, class B> \
#define CGAL_REAL_EMBEDDABLE_BODY \
class Abs \
: public std::unary_function< Type, Type > { \
: public CGAL::unary_function< Type, Type > { \
public: \
Type operator()( const Type& x ) const { \
if (x < Type(0)) return -x; \
@ -268,7 +268,7 @@ template <class A, class B> \
}; \
\
class Sgn \
: public std::unary_function< Type, ::CGAL::Sign > { \
: public CGAL::unary_function< Type, ::CGAL::Sign > { \
public: \
::CGAL::Sign operator()( const Type& x ) const { \
return static_cast<CGAL::Sign>(x.compare(0)); \
@ -290,7 +290,7 @@ template <class A, class B> \
}; \
\
class To_double \
: public std::unary_function< Type, double > { \
: public CGAL::unary_function< Type, double > { \
public: \
double operator()( const Type& x ) const { \
return x.approximation(.00000001); \
@ -298,7 +298,7 @@ template <class A, class B> \
}; \
\
class To_interval \
: public std::unary_function< Type, std::pair< double, double > > { \
: public CGAL::unary_function< Type, std::pair< double, double > > { \
public: \
std::pair<double, double> operator()( const Type& x ) const { \
\

2
Linear_cell_complex/examples/Linear_cell_complex/gmap_linear_cell_complex_3.cpp
View File

@ -9,7 +9,7 @@ typedef LCC_3::FT FT;
// Functor used to display all the vertices of a given volume.
template<class LCC>
struct Display_vol_vertices : public std::unary_function<LCC, void>
struct Display_vol_vertices : public CGAL::unary_function<LCC, void>
{
Display_vol_vertices(const LCC& alcc) :
lcc(alcc),

2
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3.cpp
View File

@ -8,7 +8,7 @@ typedef LCC_3::Point Point;
// Functor used to display all the vertices of a given volume.
template<class LCC>
struct Display_vol_vertices : public std::unary_function<LCC, void>
struct Display_vol_vertices : public CGAL::unary_function<LCC, void>
{
Display_vol_vertices(const LCC& alcc) :
lcc(alcc),

4
Matrix_search/include/CGAL/sorted_matrix_search.h
View File

@ -124,7 +124,7 @@ private:
};
template < class Cell >
struct Cell_min
: public std::unary_function< Cell, typename Cell::Value >
: public CGAL::unary_function< Cell, typename Cell::Value >
{
typename Cell::Value
operator()( const Cell& c) const
@ -133,7 +133,7 @@ struct Cell_min
template < class Cell >
struct Cell_max
: public std::unary_function< Cell, typename Cell::Value > {
: public CGAL::unary_function< Cell, typename Cell::Value > {
Cell_max( int offset) : ofs( offset) {}

2
Mesh_2/include/CGAL/Mesh_2/Clusters.h
View File

@ -117,7 +117,7 @@ private:
typedef typename Cluster_map::value_type Cluster_map_value_type;
template <class Pair>
struct Pair_get_first: public std::unary_function<Pair,
struct Pair_get_first: public CGAL::unary_function<Pair,
typename Pair::first_type>
{
typedef typename Pair::first_type result;

2
Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
View File

@ -634,7 +634,7 @@ protected:
private: /** \name DEBUGGING TYPES AND DATAS */
class From_pair_of_vertex_to_edge
: public std::unary_function<Constrained_edge, Edge>
: public CGAL::unary_function<Constrained_edge, Edge>
{
Tr& tr;
public:

2
Mesh_2/include/CGAL/Mesh_2/Refine_faces.h
View File

@ -384,7 +384,7 @@ class Refine_faces :
typedef typename Tr::Geom_traits Geom_traits;
template <class Pair>
struct Pair_get_first: public std::unary_function<Pair,
struct Pair_get_first: public CGAL::unary_function<Pair,
typename Pair::first_type>
{
typedef typename Pair::first_type result;

2
Mesh_3/examples/Mesh_3/implicit_functions.h
View File

@ -25,7 +25,7 @@ double sphere_function (double x, double y, double z) // (c=(0,0,0), r=Sq_radius
template <typename FT, typename P>
class FT_to_point_function_wrapper : public std::unary_function<P, FT>
class FT_to_point_function_wrapper : public CGAL::unary_function<P, FT>
{
typedef FT (*Implicit_function)(FT, FT, FT);
Implicit_function function;

6
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -1028,7 +1028,7 @@ private:
* A functor which returns true if a given handle is in c3t3
*/
template <typename Handle>
class Is_in_c3t3 : public std::unary_function<Handle, bool>
class Is_in_c3t3 : public CGAL::unary_function<Handle, bool>
{
public:
Is_in_c3t3(const C3T3& c3t3) : c3t3_(c3t3) { }
@ -1045,7 +1045,7 @@ private:
* A functor which answers true if a Cell_handle is a sliver
*/
template <typename SliverCriterion>
struct Is_sliver : public std::unary_function<Cell_handle,bool>
struct Is_sliver : public CGAL::unary_function<Cell_handle,bool>
{
Is_sliver(const C3T3& c3t3,
const SliverCriterion& criterion,
@ -1318,7 +1318,7 @@ private:
*/
template <typename SliverCriterion>
class Sliver_criterion_value
: public std::unary_function<Cell_handle, double>
: public CGAL::unary_function<Cell_handle, double>
{
public:
Sliver_criterion_value(const Tr& tr,

4
Mesh_3/include/CGAL/Mesh_3/Polyline_with_context.h
View File

@ -60,9 +60,9 @@ struct Polyline_with_context
*/
template <typename Pwc_>
struct Extract_bare_polyline :
public std::unary_function<Pwc_, const typename Pwc_::Bare_polyline&>
public CGAL::unary_function<Pwc_, const typename Pwc_::Bare_polyline&>
{
typedef std::unary_function<Pwc_, const typename Pwc_::Bare_polyline&> Base;
typedef CGAL::unary_function<Pwc_, const typename Pwc_::Bare_polyline&> Base;
typedef typename Base::result_type result_type;
typedef typename Base::argument_type argument_type;

6
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
View File

@ -80,10 +80,10 @@ namespace Mesh_3 {
// to use them. -- Laurent Rineau, 2007/07/27
template <typename Map>
struct Second_of :
public std::unary_function<typename Map::value_type,
public CGAL::unary_function<typename Map::value_type,
const typename Map::mapped_type&>
{
typedef std::unary_function<typename Map::value_type,
typedef CGAL::unary_function<typename Map::value_type,
const typename Map::mapped_type&> Base;
typedef typename Base::result_type result_type;
typedef typename Base::argument_type argument_type;
@ -101,7 +101,7 @@ namespace Mesh_3 {
// It is used in Slivers_exuder, to constructor a transform iterator.
template <typename Gt, typename Vertex_handle>
class Min_distance_from_v :
public std::unary_function<Vertex_handle, void>
public CGAL::unary_function<Vertex_handle, void>
{
const Vertex_handle * v;
const Gt& gt;

2
Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h
View File

@ -116,7 +116,7 @@ private:
* Used by boost transform iterator
*/
struct Extract_point :
public std::unary_function<typename Tr::Vertex,Weighted_point>
public CGAL::unary_function<typename Tr::Vertex,Weighted_point>
{
Weighted_point operator()(const typename Tr::Vertex& v) const { return v.point(); }
};

4
Mesh_3/include/CGAL/Mesh_3/utilities.h
View File

@ -40,9 +40,9 @@ namespace internal {
*/
template <typename Pair>
struct First_of :
public std::unary_function<Pair, const typename Pair::first_type&>
public CGAL::unary_function<Pair, const typename Pair::first_type&>
{
typedef std::unary_function<Pair, const typename Pair::first_type&> Base;
typedef CGAL::unary_function<Pair, const typename Pair::first_type&> Base;
typedef typename Base::result_type result_type;
typedef typename Base::argument_type argument_type;

2
Mesh_3/test/Mesh_3/implicit_functions.h
View File

@ -25,7 +25,7 @@ double sphere_function (double x, double y, double z) // (c=(0,0,0), r=Sq_radius
template <typename FT, typename P>
class FT_to_point_function_wrapper : public std::unary_function<P, FT>
class FT_to_point_function_wrapper : public CGAL::unary_function<P, FT>
{
typedef FT (*Implicit_function)(FT, FT, FT);
Implicit_function function;

2
Mesh_3/test/Mesh_3/test_c3t3_extract_subdomains_boundaries.cpp
View File

@ -24,7 +24,7 @@ double sphere_function (double x, double y, double z) // (c=(0,0,0), r=Sq_radius
}
template <typename FT, typename P>
class FT_to_point_function_wrapper : public std::unary_function<P, FT>
class FT_to_point_function_wrapper : public CGAL::unary_function<P, FT>
{
typedef FT (*Implicit_function)(FT, FT, FT);
Implicit_function function;

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

@ -175,7 +175,7 @@ template <class NT> class Real_embeddable_traits< Nef_polynomial<NT> >
public:
typedef Nef_polynomial<NT> Type;
class Abs
: public std::unary_function< Type, Type> {
: public CGAL::unary_function< Type, Type> {
public:
Type inline operator()( const Type& x ) const {
return (CGAL::Nef::sign( x ) == CGAL::NEGATIVE)? -x : x;
@ -183,7 +183,7 @@ template <class NT> class Real_embeddable_traits< Nef_polynomial<NT> >
};
class Sgn
: public std::unary_function< Type, CGAL::Sign > {
: public CGAL::unary_function< Type, CGAL::Sign > {
public:
CGAL::Sign inline operator()( const Type& x ) const {
return CGAL::Nef::sign( x );
@ -202,7 +202,7 @@ template <class NT> class Real_embeddable_traits< Nef_polynomial<NT> >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double inline operator()( const Type& p ) const {
return CGAL::to_double(
@ -211,7 +211,7 @@ template <class NT> class Real_embeddable_traits< Nef_polynomial<NT> >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& p ) const {
return CGAL::to_interval(p.eval_at(Nef_polynomial<NT>::infi_maximal_value()));

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

@ -45,7 +45,7 @@ public:
typedef CGAL::Tag_true Is_bigfloat_interval;
struct Lower :public std::unary_function<Interval,Bound>{
struct Lower :public CGAL::unary_function<Interval,Bound>{
Bound operator() ( Interval x ) const {
CORE::BigFloat result = ::CORE::BigFloat(x.m()-x.err(),0,x.exp());
CGAL_postcondition(result <= x);
@ -53,7 +53,7 @@ public:
}
};
struct Upper :public std::unary_function<Interval,Bound>{
struct Upper :public CGAL::unary_function<Interval,Bound>{
Bound operator() ( Interval x ) const {
CORE::BigFloat result = ::CORE::BigFloat(x.m()+x.err(),0,x.exp());
CGAL_postcondition(result >= x);
@ -61,7 +61,7 @@ public:
}
};
struct Width :public std::unary_function<Interval,Bound>{
struct Width :public CGAL::unary_function<Interval,Bound>{
Bound operator() ( Interval x ) const {
unsigned long err = 2*x.err();
@ -69,21 +69,21 @@ public:
}
};
struct Median :public std::unary_function<Interval,Bound>{
struct Median :public CGAL::unary_function<Interval,Bound>{
Bound operator() ( Interval x ) const {
return Bound(x.m(),0,x.exp());
}
};
struct Norm :public std::unary_function<Interval,Bound>{
struct Norm :public CGAL::unary_function<Interval,Bound>{
Bound operator() ( Interval x ) const {
BOOST_USING_STD_MAX();
return max BOOST_PREVENT_MACRO_SUBSTITUTION (Upper()(x).abs(),Lower()(x).abs());
}
};
struct Zero_in :public std::unary_function<Interval,bool>{
struct Zero_in :public CGAL::unary_function<Interval,bool>{
bool operator() ( Interval x ) const {
return x.isZeroIn();
}
@ -228,7 +228,7 @@ public:
}
};
struct Singleton :public std::unary_function<Interval,bool> {
struct Singleton :public CGAL::unary_function<Interval,bool> {
bool operator() ( Interval x ) const {
return (x.err() == 0);
}
@ -375,7 +375,7 @@ template <> class Algebraic_structure_traits< CORE::BigFloat >
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
// What I want is a sqrt computed with
@ -428,7 +428,7 @@ template <> class Real_embeddable_traits< CORE::BigFloat >
: public INTERN_RET::Real_embeddable_traits_base< CORE::BigFloat , CGAL::Tag_true > {
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
Type result;
@ -461,7 +461,7 @@ template <> class Real_embeddable_traits< CORE::BigFloat >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
::CGAL::Sign result = sign( x.sign());
@ -482,7 +482,7 @@ template <> class Real_embeddable_traits< CORE::BigFloat >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
// this call is required to get reasonable values for the double
@ -492,7 +492,7 @@ template <> class Real_embeddable_traits< CORE::BigFloat >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {

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

@ -50,7 +50,7 @@ template <> class Algebraic_structure_traits< CORE::BigInt >
typedef INTERN_AST::Mod_per_operator< Type > Mod;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
//! computes the largest NT not larger than the square root of \a a.
Type operator()( const Type& x) const {
@ -85,7 +85,7 @@ template <> class Real_embeddable_traits< CORE::BigInt >
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CORE::abs( x );
@ -93,7 +93,7 @@ template <> class Real_embeddable_traits< CORE::BigInt >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return (::CGAL::Sign) CORE::sign( x );
@ -111,7 +111,7 @@ template <> class Real_embeddable_traits< CORE::BigInt >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
// this call is required to get reasonable values for the double
@ -121,7 +121,7 @@ template <> class Real_embeddable_traits< CORE::BigInt >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x_ ) const {
CORE::Expr x(x_);

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

@ -64,7 +64,7 @@ template <> class Real_embeddable_traits< CORE::BigRat >
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CORE::abs( x );
@ -72,7 +72,7 @@ template <> class Real_embeddable_traits< CORE::BigRat >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return (::CGAL::Sign) CORE::sign( x );
@ -91,7 +91,7 @@ template <> class Real_embeddable_traits< CORE::BigRat >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
// this call is required to get reasonable values for the double
@ -101,7 +101,7 @@ template <> class Real_embeddable_traits< CORE::BigRat >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x_ ) const {
CORE::Expr x(x_);

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

@ -41,7 +41,7 @@ template <> class Algebraic_structure_traits< CORE::Expr >
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CORE::sqrt( x );
@ -128,7 +128,7 @@ template <> class Real_embeddable_traits< CORE::Expr >
: public INTERN_RET::Real_embeddable_traits_base< CORE::Expr , CGAL::Tag_true > {
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CORE::abs( x );
@ -136,7 +136,7 @@ template <> class Real_embeddable_traits< CORE::Expr >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return (::CGAL::Sign) CORE::sign( x );
@ -158,7 +158,7 @@ template <> class Real_embeddable_traits< CORE::Expr >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
x.approx(53,1075);
@ -167,7 +167,7 @@ template <> class Real_embeddable_traits< CORE::Expr >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
std::pair<double,double> result;

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

@ -444,7 +444,7 @@ operator>=(Counted_number<NT> const &n1, Counted_number<NT> const &n2)
template <class NT>
class Is_valid< Counted_number<NT> >
: public std::unary_function< Counted_number<NT>, bool > {
: public CGAL::unary_function< Counted_number<NT>, bool > {
public:
bool operator()( const Counted_number<NT>& x ) {
return is_valid( x.rep() );
@ -514,7 +514,7 @@ namespace INTERN_COUNTED_NUMBER{
template< class NT, class Functor >
struct Simplify_selector {
struct Simplify : public std::unary_function<NT&, void> {
struct Simplify : public CGAL::unary_function<NT&, void> {
void operator()( NT& x ) const {
x.simplify();
}
@ -528,7 +528,7 @@ struct Simplify_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Unit_part_selector {
struct Unit_part : public std::unary_function<NT, NT > {
struct Unit_part : public CGAL::unary_function<NT, NT > {
NT operator()( const NT& x ) const {
return x.unit_part();
}
@ -542,7 +542,7 @@ struct Unit_part_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Is_zero_selector {
struct Is_zero : public std::unary_function<NT, bool > {
struct Is_zero : public CGAL::unary_function<NT, bool > {
bool operator()( const NT& x ) const {
return x.is_zero();
}
@ -556,7 +556,7 @@ struct Is_zero_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Is_one_selector {
struct Is_one : public std::unary_function<NT, bool > {
struct Is_one : public CGAL::unary_function<NT, bool > {
bool operator()( const NT& x ) const {
return x.is_one();
}
@ -570,7 +570,7 @@ struct Is_one_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Square_selector {
struct Square : public std::unary_function<NT, NT > {
struct Square : public CGAL::unary_function<NT, NT > {
NT operator()( const NT& x ) const {
return x.square();
}
@ -617,7 +617,7 @@ struct Is_square_selector< NT, Null_functor > {
template <class NT, class AlgebraicStructureTag>
struct Sqrt_selector{
struct Sqrt : public std::unary_function<NT,NT> {
struct Sqrt : public CGAL::unary_function<NT,NT> {
NT operator ()(const NT& x) const {
return x.sqrt();
}
@ -817,20 +817,20 @@ public:
<Counted_number<NT>, typename RET_NT::Is_zero > ::Is_zero Is_zero;
class Is_finite
: public std::unary_function< Counted_number<NT>, bool > {
: public CGAL::unary_function< Counted_number<NT>, bool > {
public:
bool operator()( const Counted_number<NT>& x ) const {
return CGAL_NTS is_finite( x.rep() );
}
};
struct To_double : public std::unary_function< Counted_number<NT>, double > {
struct To_double : public CGAL::unary_function< Counted_number<NT>, double > {
double operator()(const Counted_number<NT>& x) const {
return x.to_double();
}
};
struct To_interval: public std::unary_function< Counted_number<NT>, std::pair<double,double> > {
struct To_interval: public CGAL::unary_function< Counted_number<NT>, std::pair<double,double> > {
std::pair<double,double>
operator()(const Counted_number<NT>& x) const {
return x.to_interval();

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

@ -41,21 +41,21 @@ public:
typedef Uncertain<bool> Boolean;
struct Is_zero:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
Boolean operator()(const Type &x)const{
return x.is_zero();
}
};
struct Is_one:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
Boolean operator()(const Type &x)const{
return x.is_one();
}
};
struct Square:
public std::unary_function<Type,Type>{
public CGAL::unary_function<Type,Type>{
Type operator()(const Type &x)const{
return x.square();
};
@ -72,7 +72,7 @@ public:
};
struct Sqrt:
public std::unary_function<Type,Type>{
public CGAL::unary_function<Type,Type>{
Type operator()(const Type &x)const{
return x.sqrt();
};
@ -114,35 +114,35 @@ public INTERN_RET::Real_embeddable_traits_base<Gmpfi,CGAL::Tag_true>{
typedef AST::Is_zero Is_zero;
struct Is_finite:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
inline Boolean operator()(const Type &x)const{
return(x.is_number());
};
};
struct Abs:
public std::unary_function<Type,Type>{
public CGAL::unary_function<Type,Type>{
inline Type operator()(const Type &x)const{
return x.abs();
};
};
struct Sgn:
public std::unary_function<Type,Sign>{
public CGAL::unary_function<Type,Sign>{
inline Sign operator()(const Type &x)const{
return x.sign();
};
};
struct Is_positive:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
inline Boolean operator()(const Type &x)const{
return x.is_positive();
};
};
struct Is_negative:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
inline Boolean operator()(const Type &x)const{
return x.is_negative();
};
@ -158,14 +158,14 @@ public INTERN_RET::Real_embeddable_traits_base<Gmpfi,CGAL::Tag_true>{
};
struct To_double:
public std::unary_function<Type,double>{
public CGAL::unary_function<Type,double>{
inline double operator()(const Type &x)const{
return x.to_double();
};
};
struct To_interval:
public std::unary_function<Type,std::pair<double,double> >{
public CGAL::unary_function<Type,std::pair<double,double> >{
inline std::pair<double,double> operator()(const Type &x)const{
return x.to_interval();
};
@ -191,43 +191,43 @@ public:
}
};
struct Lower :public std::unary_function<Interval,Bound>{
struct Lower :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return a.inf();
}
};
struct Upper :public std::unary_function<Interval,Bound>{
struct Upper :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return a.sup();
}
};
struct Width :public std::unary_function<Interval,Bound>{
struct Width :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return Gmpfr::sub(a.sup(),a.inf(),std::round_toward_infinity);
}
};
struct Median :public std::unary_function<Interval,Bound>{
struct Median :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return (a.inf()+a.sup())/2;
}
};
struct Norm :public std::unary_function<Interval,Bound>{
struct Norm :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return a.abs().sup();
}
};
struct Singleton :public std::unary_function<Interval,bool>{
struct Singleton :public CGAL::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return a.inf() == a.sup();
}
};
struct Zero_in :public std::unary_function<Interval,bool>{
struct Zero_in :public CGAL::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return a.inf() <= 0 && 0 <= a.sup();
}
@ -299,7 +299,7 @@ public:
typedef Bigfloat_interval_traits<Gmpfi> Self;
typedef CGAL::Tag_true Is_bigfloat_interval;
struct Relative_precision: public std::unary_function<NT,long>{
struct Relative_precision: public CGAL::unary_function<NT,long>{
long operator()(const NT& x) const {
CGAL_precondition(!Singleton()(x));

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

@ -34,21 +34,21 @@ public:
typedef bool Boolean;
struct Is_zero:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
Boolean operator()(const Type &x)const{
return x.is_zero();
}
};
struct Is_one:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
Boolean operator()(const Type &x)const{
return x.is_one();
}
};
struct Square:
public std::unary_function<Type,Type>{
public CGAL::unary_function<Type,Type>{
Type operator()(const Type &x)const{
return x.square();
};
@ -65,7 +65,7 @@ public:
};
struct Sqrt:
public std::unary_function<Type,Type>{
public CGAL::unary_function<Type,Type>{
Type operator()(const Type &x)const{
return x.sqrt();
};
@ -95,35 +95,35 @@ public INTERN_RET::Real_embeddable_traits_base<Gmpfr,CGAL::Tag_true>{
typedef AST::Is_zero Is_zero;
struct Is_finite:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
inline Boolean operator()(const Type &x)const{
return(x.is_number());
};
};
struct Abs:
public std::unary_function<Type,Type>{
public CGAL::unary_function<Type,Type>{
inline Type operator()(const Type &x)const{
return x.abs();
};
};
struct Sgn:
public std::unary_function<Type,Sign>{
public CGAL::unary_function<Type,Sign>{
inline Sign operator()(const Type &x)const{
return x.sign();
};
};
struct Is_positive:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
inline Boolean operator()(const Type &x)const{
return(x.sign()==POSITIVE);
};
};
struct Is_negative:
public std::unary_function<Type,Boolean>{
public CGAL::unary_function<Type,Boolean>{
inline Boolean operator()(const Type &x)const{
return(x.sign()==NEGATIVE);
};
@ -139,14 +139,14 @@ public INTERN_RET::Real_embeddable_traits_base<Gmpfr,CGAL::Tag_true>{
};
struct To_double:
public std::unary_function<Type,double>{
public CGAL::unary_function<Type,double>{
inline double operator()(const Type &x)const{
return x.to_double();
};
};
struct To_interval:
public std::unary_function<Type,std::pair<double,double> >{
public CGAL::unary_function<Type,std::pair<double,double> >{
inline std::pair<double,double>operator()(const Type &x)const{
return x.to_interval();
};

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

@ -53,7 +53,7 @@ template <> class Algebraic_structure_traits< Gmpq >
};
class Simplify
: public std::unary_function< Type&, void > {
: public CGAL::unary_function< Type&, void > {
public:
void operator()( Type& x) const {
mpq_canonicalize( x.mpq() );
@ -69,7 +69,7 @@ template <> class Real_embeddable_traits< Gmpq >
public:
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return x.sign();
@ -77,7 +77,7 @@ template <> class Real_embeddable_traits< Gmpq >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return x.to_double();
@ -85,7 +85,7 @@ template <> class Real_embeddable_traits< Gmpq >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
mpfr_t y;

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

@ -96,7 +96,7 @@ public:
typedef INTERN_AST::Mod_per_operator< Type > Mod;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
Gmpz result;
@ -110,7 +110,7 @@ template <> class Real_embeddable_traits< Gmpz >
: public INTERN_RET::Real_embeddable_traits_base< Gmpz , CGAL::Tag_true > {
public:
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return x.sign();
@ -118,7 +118,7 @@ public:
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return x.to_double();
@ -126,7 +126,7 @@ public:
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
@ -148,7 +148,7 @@ template<> class Algebraic_structure_traits< Quotient<Gmpz> >
public:
typedef Quotient<Gmpz> Type;
struct To_double: public std::unary_function<Quotient<Gmpz>, double>{
struct To_double: public CGAL::unary_function<Quotient<Gmpz>, double>{
double operator()(const Quotient<Gmpz>& quot){
mpq_t mpQ;
mpq_init(mpQ);

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

@ -36,7 +36,7 @@ public:
typedef Tag_true Is_exact;
struct Is_zero
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
return x.is_zero();
@ -103,7 +103,7 @@ public:
typedef AST::Is_zero Is_zero;
struct Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return x.sign();
@ -123,7 +123,7 @@ public:
};
struct To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return x.to_double();
@ -131,7 +131,7 @@ public:
};
struct To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return x.to_interval();
@ -146,7 +146,7 @@ class Real_embeddable_traits< Quotient<Gmpzf> >
INTERN_QUOTIENT::Real_embeddable_traits_quotient_base< Quotient<Gmpzf> >
{
public:
struct To_double: public std::unary_function<Quotient<Gmpzf>, double>{
struct To_double: public CGAL::unary_function<Quotient<Gmpzf>, double>{
inline
double operator()(const Quotient<Gmpzf>& q) const {
std::pair<double, long> n = q.numerator().to_double_exp();
@ -157,7 +157,7 @@ public:
}
};
struct To_interval
: public std::unary_function<Quotient<Gmpzf>, std::pair<double,double> >{
: public CGAL::unary_function<Quotient<Gmpzf>, std::pair<double,double> >{
inline
std::pair<double,double> operator()(const Quotient<Gmpzf>& q) const {
// do here as MP_Float does

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

@ -445,7 +445,7 @@ relative_precision(const Interval_nt<Protected> & d)
template< bool Protected >
class Is_valid< Interval_nt<Protected> >
: public std::unary_function< Interval_nt<Protected>, bool > {
: public CGAL::unary_function< Interval_nt<Protected>, bool > {
public :
bool operator()( const Interval_nt<Protected>& x ) const {
return is_valid(x.inf()) &&
@ -959,7 +959,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
typedef Uncertain<CGAL::Comparison_result> Comparison_result;
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::abs( x );
@ -967,7 +967,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
};
class Sgn
: public std::unary_function< Type, Uncertain< ::CGAL::Sign > > {
: public CGAL::unary_function< Type, Uncertain< ::CGAL::Sign > > {
public:
Uncertain< ::CGAL::Sign > operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::sign( x );
@ -975,7 +975,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
};
class Is_positive
: public std::unary_function< Type, Uncertain<bool> > {
: public CGAL::unary_function< Type, Uncertain<bool> > {
public:
Uncertain<bool> operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::is_positive( x );
@ -983,7 +983,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
};
class Is_negative
: public std::unary_function< Type, Uncertain<bool> > {
: public CGAL::unary_function< Type, Uncertain<bool> > {
public:
Uncertain<bool> operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::is_negative( x );
@ -1001,7 +1001,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::to_double( x );
@ -1009,7 +1009,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::to_interval( x );
@ -1017,7 +1017,7 @@ template< bool B > class Real_embeddable_traits< Interval_nt<B> >
};
class Is_finite
: public std::unary_function< Type, Boolean > {
: public CGAL::unary_function< Type, Boolean > {
public :
Boolean operator()( const Type& x ) const {
return CGAL_NTS is_finite( x.inf() ) && CGAL_NTS is_finite( x.sup() );
@ -1038,7 +1038,7 @@ class Algebraic_structure_traits< Interval_nt<B> >
typedef Uncertain<bool> Boolean;
class Is_zero
: public std::unary_function< Type, Boolean > {
: public CGAL::unary_function< Type, Boolean > {
public:
Boolean operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::is_zero( x );
@ -1046,7 +1046,7 @@ class Algebraic_structure_traits< Interval_nt<B> >
};
class Is_one
: public std::unary_function< Type, Boolean > {
: public CGAL::unary_function< Type, Boolean > {
public:
Boolean operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::is_one( x );
@ -1054,7 +1054,7 @@ class Algebraic_structure_traits< Interval_nt<B> >
};
class Square
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::square( x );
@ -1062,7 +1062,7 @@ class Algebraic_structure_traits< Interval_nt<B> >
};
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::sqrt( x );
@ -1161,43 +1161,43 @@ public:
}
};
struct Lower :public std::unary_function<Interval,Bound>{
struct Lower :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return a.inf();
}
};
struct Upper :public std::unary_function<Interval,Bound>{
struct Upper :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return a.sup();
}
};
struct Width :public std::unary_function<Interval,Bound>{
struct Width :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return width(a);
}
};
struct Median :public std::unary_function<Interval,Bound>{
struct Median :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return (Lower()(a)+Upper()(a))/2.0;
}
};
struct Norm :public std::unary_function<Interval,Bound>{
struct Norm :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return magnitude(a);
}
};
struct Singleton :public std::unary_function<Interval,bool>{
struct Singleton :public CGAL::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return Lower()(a) == Upper()(a);
}
};
struct Zero_in :public std::unary_function<Interval,bool>{
struct Zero_in :public CGAL::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return Lower()(a) <= 0 && 0 <= Upper()(a);
}

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

@ -685,7 +685,7 @@ namespace INTERN_LAZY_EXACT_NT {
template< class NT, class Functor >
struct Simplify_selector {
struct Simplify : public std::unary_function<NT&, void> {
struct Simplify : public CGAL::unary_function<NT&, void> {
void operator()( NT& ) const {
// TODO: In the old implementation the Simplify-functor was the default
// (which does nothing). But this cannot be the correct way!?
@ -700,7 +700,7 @@ struct Simplify_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Unit_part_selector {
struct Unit_part : public std::unary_function<NT, NT > {
struct Unit_part : public CGAL::unary_function<NT, NT > {
NT operator()( const NT& x ) const {
return NT( CGAL_NTS unit_part( x.exact() ) );
}
@ -714,7 +714,7 @@ struct Unit_part_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Is_zero_selector {
struct Is_zero : public std::unary_function<NT, bool > {
struct Is_zero : public CGAL::unary_function<NT, bool > {
bool operator()( const NT& x ) const {
return CGAL_NTS is_zero( x.exact() );
}
@ -728,7 +728,7 @@ struct Is_zero_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Is_one_selector {
struct Is_one : public std::unary_function<NT, bool > {
struct Is_one : public CGAL::unary_function<NT, bool > {
bool operator()( const NT& x ) const {
return CGAL_NTS is_one( x.exact() );
}
@ -742,7 +742,7 @@ struct Is_one_selector< NT, Null_functor > {
template< class NT, class Functor >
struct Square_selector {
struct Square : public std::unary_function<NT, NT > {
struct Square : public CGAL::unary_function<NT, NT > {
NT operator()( const NT& x ) const {
CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION));
return new Lazy_exact_Square<typename NT::ET>(x);
@ -795,7 +795,7 @@ struct Is_square_selector< NT, Null_functor > {
template <class NT, class AlgebraicStructureTag>
struct Sqrt_selector{
struct Sqrt : public std::unary_function<NT, NT > {
struct Sqrt : public CGAL::unary_function<NT, NT > {
NT operator ()(const NT& x) const {
CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION));
CGAL_precondition(x >= 0);
@ -1032,7 +1032,7 @@ template < typename ET > class Real_embeddable_traits< Lazy_exact_nt<ET> >
typedef Lazy_exact_nt<ET> Type;
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& a ) const {
CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION));
@ -1041,7 +1041,7 @@ template < typename ET > class Real_embeddable_traits< Lazy_exact_nt<ET> >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& a ) const {
CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp);
@ -1075,7 +1075,7 @@ template < typename ET > class Real_embeddable_traits< Lazy_exact_nt<ET> >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& a ) const {
CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp);
@ -1100,7 +1100,7 @@ template < typename ET > class Real_embeddable_traits< Lazy_exact_nt<ET> >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& a ) const {
CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION));
@ -1109,7 +1109,7 @@ template < typename ET > class Real_embeddable_traits< Lazy_exact_nt<ET> >
};
class Is_finite
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
return CGAL_NTS is_finite(x.approx()) || CGAL_NTS is_finite(x.exact());
@ -1318,7 +1318,7 @@ operator>> (std::istream & is, Lazy_exact_nt<ET> & a)
template< class ET >
class Is_valid< Lazy_exact_nt<ET> >
: public std::unary_function< Lazy_exact_nt<ET>, bool > {
: public CGAL::unary_function< Lazy_exact_nt<ET>, bool > {
public :
bool operator()( const Lazy_exact_nt<ET>& x ) const {
return is_valid(x.approx());

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

@ -416,7 +416,7 @@ template <> class Algebraic_structure_traits< MP_Float >
typedef Tag_true Is_numerical_sensitive;
struct Unit_part
: public std::unary_function< Type , Type >
: public CGAL::unary_function< Type , Type >
{
Type operator()(const Type &x) const {
return x.unit_part();
@ -440,7 +440,7 @@ template <> class Algebraic_structure_traits< MP_Float >
class Square
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return INTERN_MP_FLOAT::square(x);
@ -493,7 +493,7 @@ template <> class Real_embeddable_traits< MP_Float >
public:
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return x.sign();
@ -511,7 +511,7 @@ template <> class Real_embeddable_traits< MP_Float >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return INTERN_MP_FLOAT::to_double( x );
@ -519,7 +519,7 @@ template <> class Real_embeddable_traits< MP_Float >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return INTERN_MP_FLOAT::to_interval( x );
@ -851,14 +851,14 @@ class Real_embeddable_traits< Quotient<MP_Float> >
: public INTERN_QUOTIENT::Real_embeddable_traits_quotient_base<
Quotient<MP_Float> >{
public:
struct To_double: public std::unary_function<Quotient<MP_Float>, double>{
struct To_double: public CGAL::unary_function<Quotient<MP_Float>, double>{
inline
double operator()(const Quotient<MP_Float>& q) const {
return INTERN_MP_FLOAT::to_double(q);
}
};
struct To_interval
: public std::unary_function<Quotient<MP_Float>, std::pair<double,double> > {
: public CGAL::unary_function<Quotient<MP_Float>, std::pair<double,double> > {
inline
std::pair<double,double> operator()(const Quotient<MP_Float>& q) const {
return INTERN_MP_FLOAT::to_interval(q);

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

@ -1020,14 +1020,14 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
typedef Tag_false Is_numerical_sensitive;
struct Is_zero
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
bool operator()( const Type& x ) const {
return x.is_zero();
}
};
struct Is_one
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
bool operator()( const Type& x ) const {
return x.is_one();
}
@ -1043,7 +1043,7 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
};
struct Square
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
Type operator()( const Type& x ) const {
return Mpzf_square(x);
}
@ -1059,7 +1059,7 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
};
struct Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
Type operator()( const Type& x) const {
return Mpzf_sqrt(x);
}
@ -1082,14 +1082,14 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
template <> struct Real_embeddable_traits< Mpzf >
: public INTERN_RET::Real_embeddable_traits_base< Mpzf , CGAL::Tag_true > {
struct Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
::CGAL::Sign operator()( const Type& x ) const {
return x.sign();
}
};
struct To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
double operator()( const Type& x ) const {
return x.to_double();
}
@ -1105,7 +1105,7 @@ std::istream& operator>> (std::istream& is, Mpzf& a)
};
struct To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
std::pair<double, double> operator()( const Type& x ) const {
return x.to_interval();
}

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

@ -33,7 +33,7 @@ namespace CGAL {
template < class NT1, class NT2 >
struct NT_converter
: public std::unary_function< NT1, NT2 >
: public CGAL::unary_function< NT1, NT2 >
{
NT2
operator()(const NT1 &a) const
@ -49,7 +49,7 @@ struct NT_converter
template < class NT1 >
struct NT_converter < NT1, NT1 >
: public std::unary_function< NT1, NT1 >
: public CGAL::unary_function< NT1, NT1 >
{
const NT1 &
operator()(const NT1 &a) const
@ -60,7 +60,7 @@ struct NT_converter < NT1, NT1 >
template < class NT1 >
struct NT_converter < NT1, double >
: public std::unary_function< NT1, double >
: public CGAL::unary_function< NT1, double >
{
double
operator()(const NT1 &a) const
@ -71,7 +71,7 @@ struct NT_converter < NT1, double >
template <>
struct NT_converter < double, double >
: public std::unary_function< double, double >
: public CGAL::unary_function< double, double >
{
const double &
operator()(const double &a) const
@ -82,7 +82,7 @@ struct NT_converter < double, double >
template < class NT1, bool b >
struct NT_converter < NT1, Interval_nt<b> >
: public std::unary_function< NT1, Interval_nt<b> >
: public CGAL::unary_function< NT1, Interval_nt<b> >
{
Interval_nt<b>
operator()(const NT1 &a) const
@ -93,7 +93,7 @@ struct NT_converter < NT1, Interval_nt<b> >
template < bool b >
struct NT_converter < Interval_nt<b>, Interval_nt<b> >
: public std::unary_function< Interval_nt<b>, Interval_nt<b> >
: public CGAL::unary_function< Interval_nt<b>, Interval_nt<b> >
{
const Interval_nt<b> &
operator()(const Interval_nt<b> &a) const

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

@ -401,7 +401,7 @@ operator>=(int i, const Number_type_checker<NT1, NT2, Cmp> &b)
template < typename NT1, typename NT2, typename Cmp >
class Is_valid< Number_type_checker<NT1, NT2, Cmp> >
: public std::unary_function< Number_type_checker<NT1, NT2, Cmp> , bool > {
: public CGAL::unary_function< Number_type_checker<NT1, NT2, Cmp> , bool > {
public :
bool operator()(const Number_type_checker<NT1, NT2, Cmp>& a ) const {
bool b1 = is_valid(a.n1());
@ -434,7 +434,7 @@ private:
public:
//CGAL::Algebraic_structure_traits<>::Simplify
class Simplify
: public std::unary_function< Type& , void > {
: public CGAL::unary_function< Type& , void > {
public:
void operator()( Type& a) const {
typename AST1::Simplify()(a.n1());
@ -445,7 +445,7 @@ public:
//CGAL::Algebraic_structure_traits< >::Is_zero
class Is_zero
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()(const Type& a ) const {
bool b1 = typename AST1::Is_zero()(a.n1());
@ -457,7 +457,7 @@ public:
// CGAL::Algebraic_structure_traits< >::Is_one
class Is_one
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()(const Type& a) const {
bool b1 = typename AST1::Is_one()(a.n1());
@ -468,7 +468,7 @@ public:
};
// CGAL::Algebraic_structure_traits< >::Square
class Square
: public std::unary_function< Type , Type > {
: public CGAL::unary_function< Type , Type > {
public:
Type operator()(const Type& a) const {
return Type(
@ -480,7 +480,7 @@ public:
// CGAL::Algebraic_structure_traits< >::Unit_part
class Unit_part
: public std::unary_function< Type , Type > {
: public CGAL::unary_function< Type , Type > {
public:
Type operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("AST::Unit_part");
@ -649,7 +649,7 @@ private:
typedef Number_type_checker<NT1, NT2, Cmp> Type;
public:
class Inverse
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& a ) const {
NT1 r1 = typename AST1::Inverse()(a.n1());
@ -676,7 +676,7 @@ public:
// CGAL::Algebraic_structure_traits< >::Sqrt
class Sqrt
: public std::unary_function< Type , Type > {
: public CGAL::unary_function< Type , Type > {
public:
Type operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("AST::Sqrt");
@ -725,7 +725,7 @@ public:
// CGAL::Real_embeddable_traits< >::Abs
class Abs
: public std::unary_function< Type , Type > {
: public CGAL::unary_function< Type , Type > {
public:
Type operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::Abs");
@ -737,7 +737,7 @@ public:
// CGAL::Real_embeddable_traits< >::Sign
class Sgn
: public std::unary_function< Type , ::CGAL::Sign > {
: public CGAL::unary_function< Type , ::CGAL::Sign > {
public:
::CGAL::Sign operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::Sign");
@ -749,7 +749,7 @@ public:
// CGAL::Real_embeddable_traits< >::Is_finite
class Is_finite
: public std::unary_function< Type , bool > {
: public CGAL::unary_function< Type , bool > {
public:
bool operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::Is_finite");
@ -761,7 +761,7 @@ public:
// CGAL::Real_embeddable_traits< >::Is_positive
class Is_positive
: public std::unary_function< Type , bool > {
: public CGAL::unary_function< Type , bool > {
public:
bool operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::Is_positive");
@ -773,7 +773,7 @@ public:
// CGAL::Real_embeddable_traits< >::Is_negative
class Is_negative
: public std::unary_function< Type , bool > {
: public CGAL::unary_function< Type , bool > {
public:
bool operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::Is_negative");
@ -785,7 +785,7 @@ public:
// CGAL::Real_embeddable_traits< >::Is_zero
class Is_zero
: public std::unary_function< Type , bool > {
: public CGAL::unary_function< Type , bool > {
public:
bool operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::Is_zero");
@ -809,7 +809,7 @@ public:
// CGAL::Real_embeddable_traits< >::To_double
class To_double
: public std::unary_function< Type , double > {
: public CGAL::unary_function< Type , double > {
public:
double operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::To_double");
@ -821,7 +821,7 @@ public:
// CGAL::Real_embeddable_traits< >::To_interval
class To_interval
: public std::unary_function< Type , std::pair<double, double> > {
: public CGAL::unary_function< Type , std::pair<double, double> > {
public:
std::pair<double, double> operator()(const Type& a) const {
CGAL_NT_CHECK_DEBUG("RET::To_interval");

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

@ -547,7 +547,7 @@ operator>(const Quotient<NT>& x, const CGAL_double(NT)& y)
template< class NT >
class Is_valid< Quotient<NT> >
: public std::unary_function< Quotient<NT>, bool > {
: public CGAL::unary_function< Quotient<NT>, bool > {
public :
bool operator()( const Quotient<NT>& x ) const {
return is_valid(x.num) && is_valid(x.den);
@ -606,7 +606,7 @@ namespace INTERN_QUOTIENT {
class Sqrt_selector {
public:
class Sqrt
: public std::unary_function< NT, NT > {
: public CGAL::unary_function< NT, NT > {
public:
NT operator()( const NT& x ) const {
CGAL_precondition(x > 0);
@ -669,7 +669,7 @@ public:
>::type Sqrt;
class Simplify
: public std::unary_function< Type&, void > {
: public CGAL::unary_function< Type&, void > {
public:
void operator()( Type& x) const {
x.normalize();
@ -697,7 +697,7 @@ template < class NT > class Real_embeddable_traits_quotient_base< Quotient<NT> >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
// Original global function was marked with an TODO!!
@ -729,7 +729,7 @@ template < class NT > class Real_embeddable_traits_quotient_base< Quotient<NT> >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
Interval_nt<> quot =
@ -740,7 +740,7 @@ template < class NT > class Real_embeddable_traits_quotient_base< Quotient<NT> >
};
class Is_finite
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
return CGAL_NTS is_finite(x.num) && CGAL_NTS is_finite(x.den);

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

@ -41,7 +41,7 @@ class Sqrt_extension_algebraic_structure_traits_base< Type,
typedef CGAL::Integral_domain_without_division_tag Algebraic_category;
class Simplify
: public std::unary_function< Type&, void > {
: public CGAL::unary_function< Type&, void > {
public:
typedef void result_type;
typedef Type& argument_type;
@ -159,14 +159,14 @@ class Sqrt_extension_algebraic_structure_traits_base< Type,
typedef Field_tag Algebraic_category;
class Unit_part
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return( x == Type(0) ? Type(1) : x );
}
};
class Inverse
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return Type(1)/x ;

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

@ -35,7 +35,7 @@ class Real_embeddable_traits< Sqrt_extension<COEFF, ROOT, ACDE_TAG,FP_TAG> >
typedef Sqrt_extension<COEFF, ROOT, ACDE_TAG,FP_TAG> Type;
class Sgn
: public std::unary_function< Type, ::CGAL::Sign >{
: public CGAL::unary_function< Type, ::CGAL::Sign >{
public:
::CGAL::Sign operator()( const Type& x ) const {
return x.sign();
@ -63,7 +63,7 @@ class Real_embeddable_traits< Sqrt_extension<COEFF, ROOT, ACDE_TAG,FP_TAG> >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double,double> operator()(const Type& x) const {
return x.to_interval();
@ -71,7 +71,7 @@ class Real_embeddable_traits< Sqrt_extension<COEFF, ROOT, ACDE_TAG,FP_TAG> >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
// The main problem here is, that even tough the total
// expression fits into double, one of the coefficients

6
Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h
View File

@ -677,7 +677,7 @@ Sqrt_extension<NT,ROOT,ACDE_TAG,FP_TAG> square (const Sqrt_extension<NT,ROOT,ACD
//NT_converter specializations
template <class NT1,class ROOT1,class NT2,class ROOT2,class ACDE_TAG,class FP_TAG>
struct NT_converter < Sqrt_extension<NT1,ROOT1,ACDE_TAG,FP_TAG> , Sqrt_extension<NT2,ROOT2,ACDE_TAG,FP_TAG> >
: public std::unary_function< NT1, NT2 >
: public CGAL::unary_function< NT1, NT2 >
{
Sqrt_extension<NT2,ROOT2,ACDE_TAG,FP_TAG>
operator()(const Sqrt_extension<NT1,ROOT1,ACDE_TAG,FP_TAG> &a) const
@ -695,7 +695,7 @@ struct NT_converter < Sqrt_extension<NT1,ROOT1,ACDE_TAG,FP_TAG> , Sqrt_extension
template <class NT1,class NT2,class ROOT2,class ACDE_TAG,class FP_TAG>
struct NT_converter < NT1 , Sqrt_extension<NT2,ROOT2,ACDE_TAG,FP_TAG> >
: public std::unary_function< NT1, NT2 >
: public CGAL::unary_function< NT1, NT2 >
{
Sqrt_extension<NT2,ROOT2,ACDE_TAG,FP_TAG>
operator()(const NT1 &a) const
@ -707,7 +707,7 @@ struct NT_converter < NT1 , Sqrt_extension<NT2,ROOT2,ACDE_TAG,FP_TAG> >
//needed because it's a better match than the specialization <NT1,NT1>
template <class NT1,class ROOT1,class ACDE_TAG,class FP_TAG>
struct NT_converter < Sqrt_extension<NT1,ROOT1,ACDE_TAG,FP_TAG>, Sqrt_extension<NT1,ROOT1,ACDE_TAG,FP_TAG> >
: public std::unary_function< NT1, NT1 >
: public CGAL::unary_function< NT1, NT1 >
{
const Sqrt_extension<NT1,ROOT1,ACDE_TAG,FP_TAG>&
operator()(const Sqrt_extension<NT1,ROOT1,ACDE_TAG,FP_TAG> &a) const

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

@ -48,7 +48,7 @@ class Sqrt_extension_bfi_cache {
typedef typename Coercion_traits<ROOT,BFI>::Cast Cast;
typedef typename Algebraic_structure_traits<BFI>::Sqrt Sqrt;
struct Creator : public std::unary_function<BFI,Input> {
struct Creator : public CGAL::unary_function<BFI,Input> {
BFI operator()(const Input& pair){
return Sqrt()(Cast()(pair.second));
}

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

@ -72,7 +72,7 @@ is_nan_by_mask_double(unsigned int h, unsigned int l)
template<>
class Is_valid< double >
: public std::unary_function< double, bool > {
: public CGAL::unary_function< double, bool > {
public :
bool operator()( const double& x ) const{
double d = x;
@ -85,7 +85,7 @@ class Is_valid< double >
template<>
class Is_valid< double >
: public std::unary_function< double, bool > {
: public CGAL::unary_function< double, bool > {
public :
bool operator()( const double& x ) const {
#ifdef _MSC_VER
@ -106,7 +106,7 @@ template <> class Algebraic_structure_traits< double >
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return std::sqrt( x );
@ -152,7 +152,7 @@ template <> class Real_embeddable_traits< double >
// GCC is faster with std::fabs().
#if defined(__GNUG__) || defined(CGAL_MSVC_USE_STD_FABS) || defined(CGAL_USE_SSE2_FABS)
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
#ifdef CGAL_USE_SSE2_FABS
@ -166,7 +166,7 @@ template <> class Real_embeddable_traits< double >
// Is_finite depends on platform
class Is_finite
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public :
bool operator()( const Type& x ) const {
#ifdef CGAL_CFG_IEEE_754_BUG

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

@ -62,7 +62,7 @@ is_nan_by_mask_float(unsigned int u)
template<>
class Is_valid< float >
: public std::unary_function< float, bool > {
: public CGAL::unary_function< float, bool > {
public :
bool operator()( const float& x ) const {
float f = x;
@ -75,7 +75,7 @@ class Is_valid< float >
template<>
class Is_valid< float >
: public std::unary_function< float, bool > {
: public CGAL::unary_function< float, bool > {
public :
bool operator()( const float& x ) const {
return (x == x);
@ -92,7 +92,7 @@ template <> class Algebraic_structure_traits< float >
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return std::sqrt( x );
@ -115,7 +115,7 @@ template <> class Real_embeddable_traits< float >
public:
// Is_finite depends on platform
class Is_finite
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
#ifdef CGAL_CFG_IEEE_754_BUG

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

@ -121,7 +121,7 @@ template <> class Real_embeddable_traits< long int >
public:
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return Interval_nt<true>(x).pair();
@ -281,7 +281,7 @@ template <> class Real_embeddable_traits< unsigned long >
public:
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return Interval_nt<true>(x).pair();

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

@ -44,7 +44,7 @@ template <> class Algebraic_structure_traits< leda_bigfloat >
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CGAL_LEDA_SCOPE::sqrt( x );
@ -72,7 +72,7 @@ template <> class Real_embeddable_traits< leda_bigfloat >
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CGAL_LEDA_SCOPE::abs( x );
@ -80,7 +80,7 @@ public:
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return (::CGAL::Sign) CGAL_LEDA_SCOPE::sign( x );
@ -101,7 +101,7 @@ public:
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return x.to_double();
@ -109,7 +109,7 @@ public:
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
@ -123,7 +123,7 @@ public:
};
class Is_finite
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
return !( CGAL_LEDA_SCOPE::isInf(x) || CGAL_LEDA_SCOPE::isNaN(x) );
@ -133,7 +133,7 @@ public:
template<>
class Is_valid< leda_bigfloat >
: public std::unary_function< leda_bigfloat, bool > {
: public CGAL::unary_function< leda_bigfloat, bool > {
public :
bool operator()( const leda_bigfloat& x ) const {
return !( CGAL_LEDA_SCOPE::isNaN(x) );

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

@ -175,7 +175,7 @@ public:
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return ::boost::numeric::sqrt(x);
@ -188,7 +188,7 @@ template <> class Real_embeddable_traits< leda_bigfloat_interval >
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return ::boost::numeric::abs(x);
@ -196,7 +196,7 @@ public:
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return CGAL::to_double(::boost::numeric::median(x));
@ -204,7 +204,7 @@ public:
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
std::pair<double, double> lower_I(CGAL::to_interval(x.lower()));
@ -320,49 +320,49 @@ public:
}
};
struct Lower :public std::unary_function<Interval,Bound>{
struct Lower :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return a.lower();
}
};
struct Upper :public std::unary_function<Interval,Bound>{
struct Upper :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return a.upper();
}
};
struct Width :public std::unary_function<Interval,Bound>{
struct Width :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return ::boost::numeric::width(a);
}
};
struct Median :public std::unary_function<Interval,Bound>{
struct Median :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return ::boost::numeric::median(a);
}
};
struct Norm :public std::unary_function<Interval,Bound>{
struct Norm :public CGAL::unary_function<Interval,Bound>{
Bound operator()( const Interval& a ) const {
return ::boost::numeric::norm(a);
}
};
struct Empty :public std::unary_function<Interval,bool>{
struct Empty :public CGAL::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return ::boost::numeric::empty(a);
}
};
struct Singleton :public std::unary_function<Interval,bool>{
struct Singleton :public CGAL::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return ::boost::numeric::singleton(a);
}
};
struct Zero_in :public std::unary_function<Interval,bool>{
struct Zero_in :public CGAL::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return ::boost::numeric::in_zero(a);
}
@ -423,7 +423,7 @@ public:
typedef CGAL::Tag_true Is_bigfloat_interval;
// struct Get_significant_bits : public std::unary_function<NT,long>{
// struct Get_significant_bits : public CGAL::unary_function<NT,long>{
// long operator()( NT x) const {
// CGAL_precondition(!Singleton()(x));
// leda::bigfloat lower = x.lower();
@ -443,7 +443,7 @@ public:
// };
struct Relative_precision: public std::unary_function<NT,long>{
struct Relative_precision: public CGAL::unary_function<NT,long>{
long operator()(const NT& x) const {
CGAL_precondition(!Singleton()(x));
CGAL_precondition(!CGAL::zero_in(x));
@ -454,7 +454,7 @@ public:
}
};
struct Set_precision : public std::unary_function<long,long> {
struct Set_precision : public CGAL::unary_function<long,long> {
long operator()( long prec ) const {
return BF::set_precision(prec);
}

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

@ -117,7 +117,7 @@ template <> class Algebraic_structure_traits< leda_integer >
// };
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CGAL_LEDA_SCOPE::sqrt( x );
@ -130,7 +130,7 @@ template <> class Real_embeddable_traits< leda_integer >
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CGAL_LEDA_SCOPE::abs( x );
@ -138,7 +138,7 @@ template <> class Real_embeddable_traits< leda_integer >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return (::CGAL::Sign) CGAL_LEDA_SCOPE::sign( x );
@ -157,7 +157,7 @@ template <> class Real_embeddable_traits< leda_integer >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return x.to_double();
@ -165,7 +165,7 @@ template <> class Real_embeddable_traits< leda_integer >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
leda::bigfloat h(x);

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

@ -63,7 +63,7 @@ template <> class Algebraic_structure_traits< leda_rational >
// Is_square;
class Simplify
: public std::unary_function< Type&, void > {
: public CGAL::unary_function< Type&, void > {
public:
void operator()( Type& x) const {
x.normalize();
@ -77,7 +77,7 @@ template <> class Real_embeddable_traits< leda_rational >
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CGAL_LEDA_SCOPE::abs( x );
@ -85,7 +85,7 @@ template <> class Real_embeddable_traits< leda_rational >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return (::CGAL::Sign) CGAL_LEDA_SCOPE::sign( x );
@ -104,7 +104,7 @@ template <> class Real_embeddable_traits< leda_rational >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
return x.to_double();
@ -112,7 +112,7 @@ template <> class Real_embeddable_traits< leda_rational >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {

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

@ -50,7 +50,7 @@ template <> class Algebraic_structure_traits< leda_real >
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CGAL_LEDA_SCOPE::sqrt( x );
@ -109,7 +109,7 @@ template <> class Real_embeddable_traits< leda_real >
: public INTERN_RET::Real_embeddable_traits_base< leda_real , CGAL::Tag_true > {
public:
class Abs
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return CGAL_LEDA_SCOPE::abs( x );
@ -117,7 +117,7 @@ template <> class Real_embeddable_traits< leda_real >
};
class Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
public:
::CGAL::Sign operator()( const Type& x ) const {
return (::CGAL::Sign) CGAL_LEDA_SCOPE::sign( x );
@ -139,7 +139,7 @@ template <> class Real_embeddable_traits< leda_real >
};
class To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
public:
double operator()( const Type& x ) const {
// this call is required to get reasonable values for the double
@ -150,7 +150,7 @@ template <> class Real_embeddable_traits< leda_real >
};
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {

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

@ -63,7 +63,7 @@ is_nan_by_mask_long_double(unsigned int h, unsigned int l)
template<>
class Is_valid< long double >
: public std::unary_function< long double, bool > {
: public CGAL::unary_function< long double, bool > {
public :
bool operator()( const long double& x ) const {
double d = x;
@ -76,7 +76,7 @@ class Is_valid< long double >
template<>
class Is_valid< long double >
: public std::unary_function< long double, bool > {
: public CGAL::unary_function< long double, bool > {
public :
bool operator()( const long double& x ) const {
return (x == x);
@ -96,7 +96,7 @@ template <> class Algebraic_structure_traits< long double >
typedef Tag_true Is_numerical_sensitive;
class Sqrt
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
public:
Type operator()( const Type& x ) const {
return std::sqrt( x );
@ -121,7 +121,7 @@ template <> class Real_embeddable_traits< long double >
public:
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
// The conversion long double to double does not always follow the
@ -146,7 +146,7 @@ template <> class Real_embeddable_traits< long double >
// Is_finite depends on platform
class Is_finite
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
public:
bool operator()( const Type& x ) const {
#ifdef CGAL_CFG_IEEE_754_BUG

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

@ -66,7 +66,7 @@ template <> class Real_embeddable_traits< long long int >
public:
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return Interval_nt<true>(x).pair();
@ -80,7 +80,7 @@ template <> class Real_embeddable_traits< unsigned long long >
public:
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return Interval_nt<true>(x).pair();
@ -108,7 +108,7 @@ template <> class Real_embeddable_traits< boost::int128_type >
public:
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return (Interval_nt<>((double)x)+Interval_nt<>::smallest()).pair();
@ -122,7 +122,7 @@ template <> class Real_embeddable_traits< boost::uint128_type >
public:
class To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
public:
std::pair<double, double> operator()( const Type& x ) const {
return (Interval_nt<>((double)x)+Interval_nt<>::smallest()).pair();

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

@ -56,7 +56,7 @@ class Algebraic_structure_traits< mpq_class >
typedef Tag_true Is_exact;
typedef Tag_false Is_numerical_sensitive;
struct Is_zero: public std::unary_function< mpq_class , bool > {
struct Is_zero: public CGAL::unary_function< mpq_class , bool > {
template <class T, class U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -64,7 +64,7 @@ class Algebraic_structure_traits< mpq_class >
}
};
struct Is_one: public std::unary_function< mpq_class , bool > {
struct Is_one: public CGAL::unary_function< mpq_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -72,20 +72,20 @@ class Algebraic_structure_traits< mpq_class >
}
};
struct Simplify: public std::unary_function< mpq_class , void > {
struct Simplify: public CGAL::unary_function< mpq_class , void > {
void operator()( mpq_class& x) const {
// do nothing because x is already canonical?
x.canonicalize();
}
};
struct Square: public std::unary_function< mpq_class , mpq_class > {
struct Square: public CGAL::unary_function< mpq_class , mpq_class > {
mpq_class operator()( const mpq_class& x) const {
return x*x;
}
};
struct Unit_part: public std::unary_function< mpq_class , mpq_class > {
struct Unit_part: public CGAL::unary_function< mpq_class , mpq_class > {
mpq_class operator()( const mpq_class& x) const {
return( x == 0) ? mpq_class(1) : x;
}
@ -130,14 +130,14 @@ class Real_embeddable_traits< mpq_class >
: public INTERN_RET::Real_embeddable_traits_base< mpq_class , CGAL::Tag_true > {
public:
struct Is_zero: public std::unary_function< mpq_class , bool > {
struct Is_zero: public CGAL::unary_function< mpq_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
return ::sgn(x) == 0;
}
};
struct Is_finite: public std::unary_function<mpq_class,bool> {
struct Is_finite: public CGAL::unary_function<mpq_class,bool> {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >&) const {
CGAL_CHECK_GMP_EXPR;
@ -145,7 +145,7 @@ class Real_embeddable_traits< mpq_class >
}
};
struct Is_positive: public std::unary_function< mpq_class , bool > {
struct Is_positive: public CGAL::unary_function< mpq_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -153,7 +153,7 @@ class Real_embeddable_traits< mpq_class >
}
};
struct Is_negative: public std::unary_function< mpq_class , bool > {
struct Is_negative: public CGAL::unary_function< mpq_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -161,7 +161,7 @@ class Real_embeddable_traits< mpq_class >
}
};
struct Abs: public std::unary_function< mpq_class , mpq_class > {
struct Abs: public CGAL::unary_function< mpq_class , mpq_class > {
template <typename T, typename U>
mpq_class operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -170,7 +170,7 @@ class Real_embeddable_traits< mpq_class >
};
struct Sgn
: public std::unary_function< mpq_class, ::CGAL::Sign > {
: public CGAL::unary_function< mpq_class, ::CGAL::Sign > {
public:
template <typename T, typename U>
::CGAL::Sign
@ -196,7 +196,7 @@ class Real_embeddable_traits< mpq_class >
};
struct To_double
: public std::unary_function< mpq_class, double > {
: public CGAL::unary_function< mpq_class, double > {
double operator()( const mpq_class& x ) const {
return x.get_d();
}
@ -204,7 +204,7 @@ class Real_embeddable_traits< mpq_class >
struct To_interval
: public std::unary_function< mpq_class, std::pair< double, double > > {
: public CGAL::unary_function< mpq_class, std::pair< double, double > > {
std::pair<double, double>
operator()( const mpq_class& x ) const {
mpfr_t y;

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

@ -57,7 +57,7 @@ public:
typedef Tag_true Is_exact;
typedef Tag_false Is_numerical_sensitive;
struct Is_zero: public std::unary_function< mpz_class , bool > {
struct Is_zero: public CGAL::unary_function< mpz_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -65,7 +65,7 @@ public:
}
};
struct Is_one: public std::unary_function< mpz_class , bool > {
struct Is_one: public CGAL::unary_function< mpz_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -73,20 +73,20 @@ public:
}
};
struct Simplify: public std::unary_function< mpz_class , void > {
struct Simplify: public CGAL::unary_function< mpz_class , void > {
template <class T, class U>
void operator()( const ::__gmp_expr< T ,U >&) const {
CGAL_CHECK_GMP_EXPR;
}
};
struct Square: public std::unary_function< mpz_class , mpz_class > {
struct Square: public CGAL::unary_function< mpz_class , mpz_class > {
mpz_class operator()( const mpz_class& x) const {
return x*x;
}
};
struct Unit_part: public std::unary_function< mpz_class , mpz_class > {
struct Unit_part: public CGAL::unary_function< mpz_class , mpz_class > {
mpz_class operator()( const mpz_class& x) const {
return (x < 0) ? -1 : 1;
}
@ -165,7 +165,7 @@ public:
};
struct Sqrt: public std::unary_function< mpz_class , mpz_class > {
struct Sqrt: public CGAL::unary_function< mpz_class , mpz_class > {
template <typename T, typename U>
mpz_class operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -196,14 +196,14 @@ class Real_embeddable_traits< mpz_class >
: public INTERN_RET::Real_embeddable_traits_base< mpz_class , CGAL::Tag_true > {
public:
struct Is_zero: public std::unary_function< mpz_class , bool > {
struct Is_zero: public CGAL::unary_function< mpz_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
return ::sgn(x) == 0;
}
};
struct Is_finite: public std::unary_function<mpz_class,bool> {
struct Is_finite: public CGAL::unary_function<mpz_class,bool> {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& ) const {
CGAL_CHECK_GMP_EXPR;
@ -211,7 +211,7 @@ public:
}
};
struct Is_positive: public std::unary_function< mpz_class , bool > {
struct Is_positive: public CGAL::unary_function< mpz_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -219,7 +219,7 @@ public:
}
};
struct Is_negative: public std::unary_function< mpz_class , bool > {
struct Is_negative: public CGAL::unary_function< mpz_class , bool > {
template <typename T, typename U>
bool operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -227,7 +227,7 @@ public:
}
};
struct Abs: public std::unary_function< mpz_class , mpz_class > {
struct Abs: public CGAL::unary_function< mpz_class , mpz_class > {
template <typename T, typename U>
mpz_class operator()( const ::__gmp_expr< T , U >& x) const {
CGAL_CHECK_GMP_EXPR;
@ -236,7 +236,7 @@ public:
};
struct Sgn
: public std::unary_function< mpz_class, ::CGAL::Sign > {
: public CGAL::unary_function< mpz_class, ::CGAL::Sign > {
public:
template <typename T, typename U>
::CGAL::Sign operator()( const ::__gmp_expr< T , U >& x ) const {
@ -260,7 +260,7 @@ public:
};
struct To_double
: public std::unary_function< mpz_class, double > {
: public CGAL::unary_function< mpz_class, double > {
double operator()( const mpz_class& x ) const {
return x.get_d();
}
@ -268,7 +268,7 @@ public:
struct To_interval
: public std::unary_function< mpz_class, std::pair< double, double > > {
: public CGAL::unary_function< mpz_class, std::pair< double, double > > {
std::pair<double, double>
operator()( const mpz_class& x ) const {
mpfr_t y;

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

@ -19,7 +19,6 @@
#define CGAL_UTILS_CLASSES_H
#include <CGAL/config.h>
#include <functional> // for std::binary_function
#ifdef CGAL_USE_SSE2_MAX
#include <CGAL/sse2.h>
@ -263,7 +262,7 @@ struct Min<double> :public std::binary_function< double, double, double > {
};
template< class T >
class Is_valid
: public std::unary_function< T, bool > {
: public CGAL::unary_function< T, bool > {
public:
bool operator()( const T& ) const {
return true;

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

@ -48,7 +48,7 @@ template<class NT1,class NT2> struct Algebraic_structure_traits<checked_NT<NT1,N
typedef typename AST1::Is_numerical_sensitive Is_numerical_sensitive;
typedef checked_NT<NT1,NT2> Type;
struct Is_zero
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
bool operator()( const Type& x ) const {
bool a=CGAL::is_zero(x.x1);
bool b=CGAL::is_zero(x.x2);
@ -57,7 +57,7 @@ template<class NT1,class NT2> struct Algebraic_structure_traits<checked_NT<NT1,N
}
};
struct Is_one
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
bool operator()( const Type& x ) const {
bool a=CGAL::is_one(x.x1);
bool b=CGAL::is_one(x.x2);
@ -66,7 +66,7 @@ template<class NT1,class NT2> struct Algebraic_structure_traits<checked_NT<NT1,N
}
};
struct Is_square
: public std::unary_function< Type, bool > {
: public CGAL::unary_function< Type, bool > {
bool operator()( const Type& x ) const {
bool a=CGAL::is_square(x.x1);
bool b=CGAL::is_square(x.x2);
@ -75,7 +75,7 @@ template<class NT1,class NT2> struct Algebraic_structure_traits<checked_NT<NT1,N
}
};
struct Square
: public std::unary_function< Type, Type > {
: public CGAL::unary_function< Type, Type > {
Type operator()( const Type& x ) const {
return Type(typename Type::pieces(),CGAL::square(x.x1),CGAL::square(x.x2));
}
@ -110,7 +110,7 @@ template<class NT1,class NT2>struct Real_embeddable_traits<checked_NT<NT1,NT2> >
: INTERN_RET::Real_embeddable_traits_base<checked_NT<NT1,NT2>, typename Real_embeddable_traits<NT1>::Is_real_embeddable> {
typedef checked_NT<NT1,NT2> Type;
struct Sgn
: public std::unary_function< Type, ::CGAL::Sign > {
: public CGAL::unary_function< Type, ::CGAL::Sign > {
::CGAL::Sign operator()( const Type& x ) const {
::CGAL::Sign a=CGAL::sign(x.x1);
::CGAL::Sign b=CGAL::sign(x.x2);
@ -119,13 +119,13 @@ template<class NT1,class NT2>struct Real_embeddable_traits<checked_NT<NT1,NT2> >
}
};
struct To_double
: public std::unary_function< Type, double > {
: public CGAL::unary_function< Type, double > {
double operator()( const Type& x ) const {
return x.to_double();
}
};
struct To_interval
: public std::unary_function< Type, std::pair< double, double > > {
: public CGAL::unary_function< Type, std::pair< double, double > > {
std::pair<double, double> operator()( const Type& x ) const {
return x.to_interval();
}

2
Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/p2t2_info_insert_with_transform_iterator_2.cpp
View File

@ -19,7 +19,7 @@ typedef Delaunay::Point Point;
//the unsigned integer is incremented at each call to
//operator()
struct Auto_count
: public std::unary_function<const Point&, std::pair<Point, unsigned> >
: public CGAL::unary_function<const Point&, std::pair<Point, unsigned> >
{
mutable unsigned i;
Auto_count() : i(0) {}

2
Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
View File

@ -184,7 +184,7 @@ public:
private:
struct Cell_handle_hash
: public std::unary_function<Cell_handle, std::size_t>
: public CGAL::unary_function<Cell_handle, std::size_t>
{
std::size_t operator()(const Cell_handle& ch) const {
return boost::hash<typename Cell_handle::pointer>()(&*ch);

4
Point_set_processing_3/include/CGAL/estimate_scale.h
View File

@ -66,7 +66,7 @@ class Quick_multiscale_approximate_knn_distance<Kernel, typename Kernel::Point_3
typedef typename Neighbor_search::iterator Iterator;
template <typename ValueType, typename PointPMap>
struct Pmap_unary_function : public std::unary_function<ValueType, typename Kernel::Point_3>
struct Pmap_unary_function : public CGAL::unary_function<ValueType, typename Kernel::Point_3>
{
PointPMap point_pmap;
Pmap_unary_function (PointPMap point_pmap) : point_pmap (point_pmap) { }
@ -222,7 +222,7 @@ class Quick_multiscale_approximate_knn_distance<Kernel, typename Kernel::Point_2
typedef typename Point_set::Vertex_handle Vertex_handle;
template <typename ValueType, typename PointPMap>
struct Pmap_unary_function : public std::unary_function<ValueType, typename Kernel::Point_2>
struct Pmap_unary_function : public CGAL::unary_function<ValueType, typename Kernel::Point_2>
{
PointPMap point_pmap;
Pmap_unary_function (PointPMap point_pmap) : point_pmap (point_pmap) { }

2
Poisson_surface_reconstruction_3/include/CGAL/Poisson_implicit_surface_3.h
View File

@ -128,7 +128,7 @@ namespace CGAL {
// non documented class
template <typename FT, typename Point>
class Poisson_implicit_function_wrapper : public std::unary_function<Point, FT>
class Poisson_implicit_function_wrapper : public CGAL::unary_function<Point, FT>
{
typedef FT (*Poisson_implicit_function)(FT, FT, FT);

2
Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp
View File

@ -44,7 +44,7 @@ typedef CGAL::Timer Timer;
template <typename PolygonMesh>
class Point_projector
: public std::unary_function<typename boost::graph_traits<PolygonMesh>::vertex_descriptor,
: public CGAL::unary_function<typename boost::graph_traits<PolygonMesh>::vertex_descriptor,
typename boost::property_traits<typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::type>::value_type> {
typedef typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::type Ppmap;
public:

2
Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_distance.cpp
View File

@ -210,7 +210,7 @@ struct Real_embeddable_traits< Custom_traits_Hausdorff::FT >
: public INTERN_RET::Real_embeddable_traits_base< Custom_traits_Hausdorff::FT , CGAL::Tag_true>
{
class To_double
: public std::unary_function< Custom_traits_Hausdorff::FT, double > {
: public CGAL::unary_function< Custom_traits_Hausdorff::FT, double > {
public:
double operator()( const Custom_traits_Hausdorff::FT& ) const { return 0; }
};

2
Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp
View File

@ -602,7 +602,7 @@ namespace SurfaceReconstruction
}
struct Point_set_make_pair_point_index
: public std::unary_function<const Point_set::Index&, std::pair<Kernel::Point_3, std::size_t> >
: public CGAL::unary_function<const Point_set::Index&, std::pair<Kernel::Point_3, std::size_t> >
{
const Point_set& point_set;
Point_set_make_pair_point_index (const Point_set& point_set) : point_set (point_set) { }

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

@ -87,7 +87,7 @@ class Polynomial_algebraic_structure_traits_base< POLY,
typedef Integral_domain_without_division_tag Algebraic_category;
class Simplify
: public std::unary_function< POLY&, void > {
: public CGAL::unary_function< POLY&, void > {
public:
void operator()( POLY& p ) const {
p.simplify_coefficients();
@ -95,7 +95,7 @@ class Polynomial_algebraic_structure_traits_base< POLY,
};
class Unit_part
: public std::unary_function< POLY, POLY > {
: public CGAL::unary_function< POLY, POLY > {
public:
POLY operator()( const POLY& x ) const {
return POLY( x.unit_part() );
@ -103,7 +103,7 @@ class Polynomial_algebraic_structure_traits_base< POLY,
};
class Is_zero
: public std::unary_function< POLY, bool > {
: public CGAL::unary_function< POLY, bool > {
public:
bool operator()( const POLY& x ) const {
return x.is_zero();

2
Polynomial/include/CGAL/Polynomial/Degree.h
View File

@ -37,7 +37,7 @@ template <typename Polynomial > struct Degree;
// Polynomial musst be at least univariate !
template <typename Coeff_ >
struct Degree<Polynomial<Coeff_> >
: public std::unary_function< Polynomial<Coeff_> , int >{
: public CGAL::unary_function< Polynomial<Coeff_> , int >{
private:
typedef Polynomial<Coeff_> Polynomial_d;

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

@ -119,7 +119,7 @@ public:
struct Multivariate_content
: public std::unary_function< Polynomial_d , Innermost_coefficient_type >{
: public CGAL::unary_function< Polynomial_d , Innermost_coefficient_type >{
Innermost_coefficient_type
operator()(const Polynomial_d& p) const {
typedef Innermost_coefficient_const_iterator IT;
@ -152,7 +152,7 @@ public:
// Multivariate_content;
struct Multivariate_content
: public std::unary_function< Polynomial_d , Innermost_coefficient_type >{
: public CGAL::unary_function< Polynomial_d , Innermost_coefficient_type >{
Innermost_coefficient_type operator()(const Polynomial_d& p) const {
if( CGAL::is_zero(p) )
return Innermost_coefficient_type(0);
@ -213,7 +213,7 @@ public:
// Univariate_content
struct Univariate_content
: public std::unary_function< Polynomial_d , Coefficient_type>{
: public CGAL::unary_function< Polynomial_d , Coefficient_type>{
Coefficient_type operator()(const Polynomial_d& p) const {
return p.content();
}
@ -283,11 +283,11 @@ public:
typedef ICoeff Innermost_coefficient_type;
struct Degree
: public std::unary_function< ICoeff , int > {
: public CGAL::unary_function< ICoeff , int > {
int operator()(const ICoeff&) const { return 0; }
};
struct Total_degree
: public std::unary_function< ICoeff , int > {
: public CGAL::unary_function< ICoeff , int > {
int operator()(const ICoeff&) const { return 0; }
};
@ -305,14 +305,14 @@ public:
typedef Null_functor Differentiate;
struct Is_square_free
: public std::unary_function< ICoeff, bool > {
: public CGAL::unary_function< ICoeff, bool > {
bool operator()( const ICoeff& ) const {
return true;
}
};
struct Make_square_free
: public std::unary_function< ICoeff, ICoeff>{
: public CGAL::unary_function< ICoeff, ICoeff>{
ICoeff operator()( const ICoeff& x ) const {
if (CGAL::is_zero(x)) return x ;
else return ICoeff(1);
@ -337,7 +337,7 @@ public:
typedef Null_functor Integral_division_up_to_constant_factor;
struct Univariate_content_up_to_constant_factor
: public std::unary_function< ICoeff, ICoeff >{
: public CGAL::unary_function< ICoeff, ICoeff >{
ICoeff operator()(const ICoeff& ) const {
// TODO: Why not return 0 if argument is 0 ?
return ICoeff(1);
@ -350,7 +350,7 @@ public:
typedef Null_functor Evaluate_homogeneous;
struct Innermost_leading_coefficient
:public std::unary_function <ICoeff, ICoeff>{
:public CGAL::unary_function <ICoeff, ICoeff>{
const ICoeff& operator()(const ICoeff& x){return x;}
};
@ -830,7 +830,7 @@ public:
typedef CGAL::internal::Degree<Polynomial_d> Degree;
// Total_degree;
struct Total_degree : public std::unary_function< Polynomial_d , int >{
struct Total_degree : public CGAL::unary_function< Polynomial_d , int >{
int operator()(const Polynomial_d& p) const {
typedef Polynomial_traits_d<Coefficient_type> COEFF_POLY_TRAITS;
typename COEFF_POLY_TRAITS::Total_degree total_degree;
@ -848,7 +848,7 @@ public:
// Leading_coefficient;
struct Leading_coefficient
: public std::unary_function< Polynomial_d , Coefficient_type>{
: public CGAL::unary_function< Polynomial_d , Coefficient_type>{
const Coefficient_type& operator()(const Polynomial_d& p) const {
return p.lcoeff();
}
@ -856,7 +856,7 @@ public:
// Innermost_leading_coefficient;
struct Innermost_leading_coefficient
: public std::unary_function< Polynomial_d , Innermost_coefficient_type>{
: public CGAL::unary_function< Polynomial_d , Innermost_coefficient_type>{
const Innermost_coefficient_type&
operator()(const Polynomial_d& p) const {
typename PTC::Innermost_leading_coefficient ilcoeff;
@ -868,7 +868,7 @@ public:
//return a canonical representative of all constant multiples.
struct Canonicalize
: public std::unary_function<Polynomial_d, Polynomial_d>{
: public CGAL::unary_function<Polynomial_d, Polynomial_d>{
private:
inline Polynomial_d canonicalize_(Polynomial_d p, CGAL::Tag_true) const
@ -910,7 +910,7 @@ public:
// Differentiate;
struct Differentiate
: public std::unary_function<Polynomial_d, Polynomial_d>{
: public CGAL::unary_function<Polynomial_d, Polynomial_d>{
Polynomial_d
operator()(Polynomial_d p, int i = (d-1)) const {
if (i == (d-1) ){
@ -1044,7 +1044,7 @@ public:
struct Construct_coefficient_const_iterator_range
: public std::unary_function< Polynomial_d,
: public CGAL::unary_function< Polynomial_d,
Coefficient_const_iterator_range> {
Coefficient_const_iterator_range
operator () (const Polynomial_d& p) const {
@ -1053,7 +1053,7 @@ struct Construct_coefficient_const_iterator_range
};
struct Construct_innermost_coefficient_const_iterator_range
: public std::unary_function< Polynomial_d,
: public CGAL::unary_function< Polynomial_d,
Innermost_coefficient_const_iterator_range> {
Innermost_coefficient_const_iterator_range
operator () (const Polynomial_d& p) const {
@ -1064,7 +1064,7 @@ struct Construct_innermost_coefficient_const_iterator_range
};
struct Is_square_free
: public std::unary_function< Polynomial_d, bool >{
: public CGAL::unary_function< Polynomial_d, bool >{
bool operator()( const Polynomial_d& p ) const {
if( !internal::may_have_multiple_factor( p ) )
return true;
@ -1089,7 +1089,7 @@ struct Construct_innermost_coefficient_const_iterator_range
struct Make_square_free
: public std::unary_function< Polynomial_d, Polynomial_d >{
: public CGAL::unary_function< Polynomial_d, Polynomial_d >{
Polynomial_d
operator()(const Polynomial_d& p) const {
if (CGAL::is_zero(p)) return p;
@ -1194,7 +1194,7 @@ struct Construct_innermost_coefficient_const_iterator_range
};
struct Univariate_content_up_to_constant_factor
:public std::unary_function<Polynomial_d, Coefficient_type> {
:public CGAL::unary_function<Polynomial_d, Coefficient_type> {
Coefficient_type
operator()(const Polynomial_d& p) const {
typename PTC::Gcd_up_to_constant_factor gcd_utcf;
@ -1287,7 +1287,7 @@ struct Construct_innermost_coefficient_const_iterator_range
};
struct Negate
: public std::unary_function< Polynomial_d, Polynomial_d >{
: public CGAL::unary_function< Polynomial_d, Polynomial_d >{
Polynomial_d operator()(const Polynomial_d& p, int i = (d-1)) const {
Construct_polynomial construct;
@ -1305,7 +1305,7 @@ struct Construct_innermost_coefficient_const_iterator_range
};
struct Invert
: public std::unary_function< Polynomial_d , Polynomial_d >{
: public CGAL::unary_function< Polynomial_d , Polynomial_d >{
Polynomial_d operator()(Polynomial_d p, int i = (PT::d-1)) const {
if (i == (d-1)){
p.reversal();

10
Polytope_distance_d/include/CGAL/Polytope_distance_d.h
View File

@ -72,7 +72,7 @@ namespace PD_detail {
// functor for a fixed column of A
template <class NT, class Iterator>
class A_column : public std::unary_function <int, NT>
class A_column : public CGAL::unary_function <int, NT>
{
public:
typedef NT result_type;
@ -120,7 +120,7 @@ namespace PD_detail {
// functor for matrix A
template <class NT, class Access_coordinate_begin_d,
class Point_iterator >
class A_matrix : public std::unary_function
class A_matrix : public CGAL::unary_function
<int, boost::transform_iterator <A_column
<NT, typename Access_coordinate_begin_d::Coordinate_iterator>,
boost::counting_iterator<int> > >
@ -176,7 +176,7 @@ namespace PD_detail {
// 1 (row d+1)
template <class NT>
class B_vector : public std::unary_function<int, NT>
class B_vector : public CGAL::unary_function<int, NT>
{
public:
typedef NT result_type;
@ -213,7 +213,7 @@ namespace PD_detail {
// functor for a fixed row of D; note that we have to return 2D in
// order to please the QP_solver
template <class NT>
class D_row : public std::unary_function <int, NT>
class D_row : public CGAL::unary_function <int, NT>
{
public:
typedef NT result_type;
@ -255,7 +255,7 @@ namespace PD_detail {
// functor for matrix D
template <class NT>
class D_matrix : public std::unary_function
class D_matrix : public CGAL::unary_function
<int, boost::transform_iterator<D_row<NT>,
boost::counting_iterator<int> > >
{

2
QP_solver/include/CGAL/QP_models.h
View File

@ -394,7 +394,7 @@ namespace QP_model_detail {
// maps a container to its begin-iterator, as specified by HowToBegin
template<typename Container, typename Iterator, typename HowToBegin>
struct Begin
: public std::unary_function< Container, Iterator >
: public CGAL::unary_function< Container, Iterator >
{
typedef Iterator result_type;
result_type operator () ( const Container& v) const

6
QP_solver/include/CGAL/QP_solution.h
View File

@ -773,7 +773,7 @@ namespace QP_solution_detail {
// Value_by_index
// --------------
template < typename ET>
class Value_by_index : public std::unary_function< std::size_t, ET>
class Value_by_index : public CGAL::unary_function< std::size_t, ET>
{
public:
typedef QP_solver_base<ET> QP;
@ -795,7 +795,7 @@ namespace QP_solution_detail {
// Unbounded_direction_by_index
// ----------------------------
template < typename ET>
class Unbounded_direction_by_index : public std::unary_function< std::size_t, ET>
class Unbounded_direction_by_index : public CGAL::unary_function< std::size_t, ET>
{
public:
typedef QP_solver_base<ET> QP;
@ -816,7 +816,7 @@ namespace QP_solution_detail {
// Lambda_by_index
// ---------------
template < typename ET>
class Lambda_by_index : public std::unary_function< std::size_t, ET>
class Lambda_by_index : public CGAL::unary_function< std::size_t, ET>
{
public:
typedef QP_solver_base<ET> QP;

8
QP_solver/include/CGAL/QP_solver/functors.h
View File

@ -64,12 +64,12 @@ class Map_with_default;
// QP_vector_accessor
// -------------------
template < class VectorIt, bool check_lower, bool check_upper >
class QP_vector_accessor : public std::unary_function<
class QP_vector_accessor : public CGAL::unary_function<
int, typename std::iterator_traits<VectorIt>::value_type > {
public:
typedef typename
std::unary_function<
CGAL::unary_function<
int,
typename std::iterator_traits<VectorIt>::value_type >::result_type
result_type;
@ -178,12 +178,12 @@ private:
// Value_by_basic_index
// --------------------
template < class RndAccIt >
class Value_by_basic_index : public std::unary_function<
class Value_by_basic_index : public CGAL::unary_function<
int, typename std::iterator_traits<RndAccIt>::value_type > {
public:
typedef typename
std::unary_function<
CGAL::unary_function<
int, typename std::iterator_traits
<RndAccIt>::value_type >::result_type
result_type;

2
QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
View File

@ -173,7 +173,7 @@ create_output_file(const char *filename, // Note: "Bernd3" and not
template<typename NT>
struct tuple_add :
public std::unary_function<const boost::tuple<NT, NT>&, NT>
public CGAL::unary_function<const boost::tuple<NT, NT>&, NT>
{
NT operator()(const boost::tuple<NT, NT>& t) const
{

2
STL_Extension/include/CGAL/Compact_container.h
View File

@ -1290,7 +1290,7 @@ namespace std {
template < class DSC, bool Const >
struct hash<CGAL::internal::CC_iterator<DSC, Const> >
: public std::unary_function<CGAL::internal::CC_iterator<DSC, Const>, std::size_t> {
: public CGAL::unary_function<CGAL::internal::CC_iterator<DSC, Const>, std::size_t> {
std::size_t operator()(const CGAL::internal::CC_iterator<DSC, Const>& i) const
{

2
STL_Extension/include/CGAL/Concurrent_compact_container.h
View File

@ -1041,7 +1041,7 @@ namespace std {
template < class CCC, bool Const >
struct hash<CGAL::CCC_internal::CCC_iterator<CCC, Const> >
: public std::unary_function<CGAL::CCC_internal::CCC_iterator<CCC, Const>, std::size_t> {
: public CGAL::unary_function<CGAL::CCC_internal::CCC_iterator<CCC, Const>, std::size_t> {
std::size_t operator()(const CGAL::CCC_internal::CCC_iterator<CCC, Const>& i) const
{

Some files were not shown because too many files have changed in this diff Show More