From 2256ae01e7bc0a32daf1fe9fb3364b7eb33fb60a Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Thu, 22 Apr 2010 09:58:25 +0000 Subject: [PATCH] Trivial fixes for the testsuite. --- .../include/CGAL/Polynomial/internal/Double_with_infinity.h | 2 +- .../CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h | 2 +- .../CGAL/Polynomial/internal/Rational/Sign_above_rational.h | 2 +- .../CGAL/Polynomial/internal/Rational/Sturm_sequence.h | 2 +- .../include/CGAL/Polynomial/internal/Simple_interval_root.h | 4 ++-- .../CGAL/Polynomial/internal/Sturm_isolating_interval.h | 2 +- .../test/Polynomial_kernel/numeric_solvers.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h index 5cc6ed3afcd..1a0f064eff4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h @@ -78,7 +78,7 @@ namespace std { static const bool has_infinity=true; static double infinity() throw() {return (std::numeric_limits::max)();} }; -}; +} CGAL_BEGIN_NAMESPACE diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h index 6e3126632a4..7ace1ec78bb 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h @@ -54,7 +54,7 @@ class Monic_Sturm_sequence // NOT WORK CORRECTLY IF p IS THE ZERO POLYNOMIAL AND q IS NOT // IN GENERAL I HAVE TO CONSIDER ALL THE LIMITING CASES if ( p.degree() >= 0 ) { - add( p / abs(p[p.degree()]) ); + this->add( p / abs(p[p.degree()]) ); this->size_++; } diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h index ea6620e3e0a..2a1eb526371 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h @@ -31,7 +31,7 @@ CGAL::Sign sign_above(const typename Kernel::Function &p, // to make sure this is not called in vain CGAL_precondition( false ); // to avoid warning - return 0; + return CGAL::ZERO; } diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h index 85e83079a77..394ce2ec6c3 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h @@ -49,7 +49,7 @@ class Sturm_sequence // NOT WORK CORRECTLY IF p IS THE ZERO POLYNOMIAL AND q IS NOT // IN GENERAL I HAVE TO CONSIDER ALL THE LIMITING CASES if ( p.degree() >= 0 ) { - add( p ); + this->add( p ); this->size_++; } 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 78ff92b63d4..1c72d97d3ec 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 @@ -23,7 +23,7 @@ #include #include #include -CGAL_POLYNOMIAL_BEGIN_INTERNAL_NAMESPACE; +CGAL_POLYNOMIAL_BEGIN_INTERNAL_NAMESPACE //! A root represented as a bounding interval and a polynomial. /*! @@ -737,5 +737,5 @@ namespace std static const bool tinyness_before =false; static const float_round_style round_stype = round_toward_zero; }; -}; +} #endif diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h index 35dde36cb15..af0c5c1aff3 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h @@ -48,7 +48,7 @@ public: } CGAL_assertion(lb() <= ub()); } - bool is_valid() { + bool is_valid() const { return b_.first <= b_.second; } diff --git a/Kinetic_data_structures/test/Polynomial_kernel/numeric_solvers.cpp b/Kinetic_data_structures/test/Polynomial_kernel/numeric_solvers.cpp index e40f4c2d90e..f63e2913a7f 100644 --- a/Kinetic_data_structures/test/Polynomial_kernel/numeric_solvers.cpp +++ b/Kinetic_data_structures/test/Polynomial_kernel/numeric_solvers.cpp @@ -160,7 +160,7 @@ namespace std { static T max BOOST_PREVENT_MACRO_SUBSTITUTION () throw() {return T((P::max)());} static T infinity() throw() {return P::infinity();} }; -}; +} int main(int argc, char* argv[])