From a25985b73b788f2b1183bcba3cd4dbed642002e5 Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Wed, 23 Jul 2008 15:07:16 +0000 Subject: [PATCH] Remove dependency on CGAL/functional -> replace Unary_function and Binary_function by std:: counterparts. --- .../CGAL/Kinetic/internal/Instantaneous_adaptor.h | 2 +- .../CGAL/Polynomial/internal/Simple_interval_root.h | 10 +++++----- .../include/CGAL/Polynomial/internal/Sturm_root_rep.h | 10 +++++----- .../include/CGAL/Tools/utility_macros.h | 10 +++++----- .../package_info/Kinetic_data_structures/changes.txt | 6 +++++- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h index 81e4dd2f7a6..1e5d8dbc8fa 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h @@ -21,7 +21,7 @@ #ifndef CGAL_INSTANTANEOUS_ADAPTOR_H #define CGAL_INSTANTANEOUS_ADAPTOR_H #include -#include +#include CGAL_KINETIC_BEGIN_NAMESPACE; diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h index 10205c8dcf6..cde9f1971eb 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h @@ -646,7 +646,7 @@ class Real_embeddable_traits< CGAL::POLYNOMIAL::internal::Simple_interval_root Type; class Abs - : public Unary_function< Type, Type > { + : public std::unary_function< Type, Type > { public: Type operator()( const Type& x ) const { if (x < Type(0)) return -x; @@ -655,7 +655,7 @@ public: }; class Sign - : public Unary_function< Type, ::CGAL::Sign > { + : public std::unary_function< Type, ::CGAL::Sign > { public: ::CGAL::Sign operator()( const Type& x ) const { return static_cast(x.compare(0)); @@ -663,7 +663,7 @@ public: }; class Compare - : public Binary_function< Type, Type, + : public std::binary_function< Type, Type, Comparison_result > { public: Comparison_result operator()( const Type& x, @@ -677,7 +677,7 @@ public: }; class To_double - : public Unary_function< Type, double > { + : public std::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 Unary_function< Type, std::pair< double, double > > { + : public std::unary_function< Type, std::pair< double, double > > { public: std::pair operator()( const Type& x ) const { diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h index d65cf4a7ce1..76c42e08f06 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h @@ -952,7 +952,7 @@ class Real_embeddable_traits< CGAL::POLYNOMIAL::internal::Sturm_root_rep > public: typedef CGAL::POLYNOMIAL::internal::Sturm_root_rep Type; class Abs - : public Unary_function< Type, Type > { + : public std::unary_function< Type, Type > { public: Type operator()( const Type& x ) const { if (x < Type(0)) return -x; @@ -961,7 +961,7 @@ public: }; class Sign - : public Unary_function< Type, ::CGAL::Sign > { + : public std::unary_function< Type, ::CGAL::Sign > { public: ::CGAL::Sign operator()( const Type& x ) const { return static_cast(x.compare(0)); @@ -969,7 +969,7 @@ public: }; class Compare - : public Binary_function< Type, Type, + : public std::binary_function< Type, Type, Comparison_result > { public: Comparison_result operator()( const Type& x, @@ -983,7 +983,7 @@ public: }; class To_double - : public Unary_function< Type, double > { + : public std::unary_function< Type, double > { public: double operator()( const Type& x ) const { // this call is required to get reasonable values for the double @@ -993,7 +993,7 @@ public: }; class To_interval - : public Unary_function< Type, std::pair< double, double > > { + : public std::unary_function< Type, std::pair< double, double > > { public: std::pair operator()( const Type& x ) const { diff --git a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h index e35cf42002c..3bf94eb32f1 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h +++ b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h @@ -224,7 +224,7 @@ template \ #define CGAL_REAL_EMBEDDABLE_BODY \ class Abs \ - : public Unary_function< Type, Type > { \ + : public std::unary_function< Type, Type > { \ public: \ Type operator()( const Type& x ) const { \ if (x < Type(0)) return -x; \ @@ -233,7 +233,7 @@ template \ }; \ \ class Sign \ - : public Unary_function< Type, ::CGAL::Sign > { \ + : public std::unary_function< Type, ::CGAL::Sign > { \ public: \ ::CGAL::Sign operator()( const Type& x ) const { \ return static_cast(x.compare(0)); \ @@ -241,7 +241,7 @@ template \ }; \ \ class Compare \ - : public Binary_function< Type, Type, \ + : public std::binary_function< Type, Type, \ Comparison_result > { \ public: \ Comparison_result operator()( const Type& x, \ @@ -255,7 +255,7 @@ template \ }; \ \ class To_double \ - : public Unary_function< Type, double > { \ + : public std::unary_function< Type, double > { \ public: \ double operator()( const Type& x ) const { \ return x.approximation(.00000001); \ @@ -263,7 +263,7 @@ template \ }; \ \ class To_interval \ - : public Unary_function< Type, std::pair< double, double > > { \ + : public std::unary_function< Type, std::pair< double, double > > { \ public: \ std::pair operator()( const Type& x ) const { \ \ diff --git a/Kinetic_data_structures/package_info/Kinetic_data_structures/changes.txt b/Kinetic_data_structures/package_info/Kinetic_data_structures/changes.txt index ed12b42d025..92b4b142ac1 100644 --- a/Kinetic_data_structures/package_info/Kinetic_data_structures/changes.txt +++ b/Kinetic_data_structures/package_info/Kinetic_data_structures/changes.txt @@ -1,3 +1,7 @@ +23 July 2008 Michael Hoffmann +- Remove dependency on CGAL/functional -> replace Unary_function + and Binary_function by std:: counterparts. + 9 March 2006 Joachim Reichel - LGPL copyright notice added to src/CGALQt/kds{,_deps}.makefile @@ -29,4 +33,4 @@ January 2007 Daniel Russel - Traits classes are now dimension independent. - Kinetic::Kinetic_kernel is now called Kinetic::Cartesian to be consistent with the static one -- Added auditing for events through the Event::audit method and the Simulator::audit_event method. This means KDSs can check for extra events and for events which the simulator does not know about. \ No newline at end of file +- Added auditing for events through the Event::audit method and the Simulator::audit_event method. This means KDSs can check for extra events and for events which the simulator does not know about.