diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h index 56695017539..542f28d5cbc 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h @@ -79,8 +79,8 @@ Polynomial modular_gcd_utcf_dfai( typedef typename PT::Innermost_coefficient_type IC; typename Coercion_traits::Cast ictp; - typename PT::Innermost_coefficient_begin begin; - typename PT::Innermost_coefficient_end end; + typename PT::Innermost_coefficient_const_begin begin; + typename PT::Innermost_coefficient_const_end end; typename PT::Innermost_leading_coefficient ilcoeff; typedef Algebraic_extension_traits ANT; diff --git a/Polynomial/include/CGAL/Polynomial/square_free_factorize.h b/Polynomial/include/CGAL/Polynomial/square_free_factorize.h index 0e8fffb34ec..ae27b1e0240 100644 --- a/Polynomial/include/CGAL/Polynomial/square_free_factorize.h +++ b/Polynomial/include/CGAL/Polynomial/square_free_factorize.h @@ -159,8 +159,8 @@ inline int square_free_factorize_for_regular_polynomial_ typedef typename Polynomial_traits_d::Innermost_coefficient_type IC; typename Polynomial_traits_d::Innermost_leading_coefficient ilcoeff; //typename Polynomial_traits_d::Innermost_coefficient_to_polynomial ictp; - typename Polynomial_traits_d::Innermost_coefficient_begin begin; - typename Polynomial_traits_d::Innermost_coefficient_end end; + typename Polynomial_traits_d::Innermost_coefficient_const_begin begin; + typename Polynomial_traits_d::Innermost_coefficient_const_end end; typename Algebraic_extension_traits::Denominator_for_algebraic_integers dfai; typename Algebraic_extension_traits::Normalization_factor nfac; typename Scalar_factor_traits::Scalar_factor sfac; diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h index 51718c0417d..435bd426763 100644 --- a/Polynomial/include/CGAL/Polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Polynomial_traits_d.h @@ -48,12 +48,12 @@ \ typedef CGAL::Recursive_const_flattening< d-1, \ typename CGAL::Polynomial::const_iterator > \ - Coefficient_flattening; \ + Coefficient_const_flattening; \ \ public: \ - typedef typename Coefficient_flattening::Recursive_flattening_iterator \ - Innermost_coefficient_iterator; \ - typedef typename Polynomial_d::iterator Coefficient_iterator; \ + typedef typename Coefficient_const_flattening::Recursive_flattening_iterator \ + Innermost_coefficient_const_iterator; \ + typedef typename Polynomial_d::const_iterator Coefficient_const_iterator; \ \ private: @@ -99,10 +99,10 @@ public: : public std::unary_function< Polynomial_d , Innermost_coefficient_type >{ Innermost_coefficient_type operator()(const Polynomial_d& p) const { - typedef Innermost_coefficient_iterator IT; + typedef Innermost_coefficient_const_iterator IT; Innermost_coefficient_type content(0); - for (IT it = typename PT::Innermost_coefficient_begin()(p); - it != typename PT::Innermost_coefficient_end()(p); + for (IT it = typename PT::Innermost_coefficient_const_begin()(p); + it != typename PT::Innermost_coefficient_const_end()(p); it++){ content = CGAL::gcd(content, *it); if(CGAL::is_one(content)) break; @@ -998,30 +998,30 @@ public: // This is going to be in PolynomialToolBox - struct Coefficient_begin - : public std::unary_function< Polynomial_d, Coefficient_iterator > { - Coefficient_iterator + struct Coefficient_const_begin + : public std::unary_function< Polynomial_d, Coefficient_const_iterator > { + Coefficient_const_iterator operator () (const Polynomial_d& p) { return p.begin(); } }; - struct Coefficient_end - : public std::unary_function< Polynomial_d, Coefficient_iterator > { - Coefficient_iterator + struct Coefficient_const_end + : public std::unary_function< Polynomial_d, Coefficient_const_iterator > { + Coefficient_const_iterator operator () (const Polynomial_d& p) { return p.end(); } }; - struct Innermost_coefficient_begin - : public std::unary_function< Polynomial_d, Innermost_coefficient_iterator > { - Innermost_coefficient_iterator + struct Innermost_coefficient_const_begin + : public std::unary_function< Polynomial_d, Innermost_coefficient_const_iterator > { + Innermost_coefficient_const_iterator operator () (const Polynomial_d& p) { - return typename Coefficient_flattening::Flatten()(p.end(),p.begin()); + return typename Coefficient_const_flattening::Flatten()(p.end(),p.begin()); } }; - struct Innermost_coefficient_end - : public std::unary_function< Polynomial_d, Innermost_coefficient_iterator > { - Innermost_coefficient_iterator + struct Innermost_coefficient_const_end + : public std::unary_function< Polynomial_d, Innermost_coefficient_const_iterator > { + Innermost_coefficient_const_iterator operator () (const Polynomial_d& p) { - return typename Coefficient_flattening::Flatten()(p.end(),p.end()); + return typename Coefficient_const_flattening::Flatten()(p.end(),p.end()); } }; @@ -1131,8 +1131,8 @@ public: typename PT::Construct_polynomial construct; typename PT::Innermost_leading_coefficient ilcoeff; - typename PT::Innermost_coefficient_begin begin; - typename PT::Innermost_coefficient_end end; + typename PT::Innermost_coefficient_const_begin begin; + typename PT::Innermost_coefficient_const_end end; typedef Algebraic_extension_traits AET; typename AET::Denominator_for_algebraic_integers dfai; typename AET::Normalization_factor nfac; diff --git a/Polynomial/test/Polynomial/Polynomial.cpp b/Polynomial/test/Polynomial/Polynomial.cpp index 47d8907b3e0..a5509993ee4 100644 --- a/Polynomial/test/Polynomial/Polynomial.cpp +++ b/Polynomial/test/Polynomial/Polynomial.cpp @@ -874,15 +874,15 @@ void flat_iterator_tests() { typedef CGAL::Polynomial_traits_d PT3; int i; - typename PT1::Innermost_coefficient_iterator it1; (void) it1; - typename PT1::Innermost_coefficient_begin begin1; (void) begin1; - typename PT1::Innermost_coefficient_end end1; (void) end1; - typename PT2::Innermost_coefficient_iterator it2; (void) it2; - typename PT2::Innermost_coefficient_begin begin2; (void) begin2; - typename PT2::Innermost_coefficient_end end2; (void) end2; - typename PT3::Innermost_coefficient_iterator it3; (void) it3; - typename PT3::Innermost_coefficient_begin begin3; (void) begin3; - typename PT3::Innermost_coefficient_end end3; (void) end3; + typename PT1::Innermost_coefficient_const_iterator it1; (void) it1; + typename PT1::Innermost_coefficient_const_begin begin1; (void) begin1; + typename PT1::Innermost_coefficient_const_end end1; (void) end1; + typename PT2::Innermost_coefficient_const_iterator it2; (void) it2; + typename PT2::Innermost_coefficient_const_begin begin2; (void) begin2; + typename PT2::Innermost_coefficient_const_end end2; (void) end2; + typename PT3::Innermost_coefficient_const_iterator it3; (void) it3; + typename PT3::Innermost_coefficient_const_begin begin3; (void) begin3; + typename PT3::Innermost_coefficient_const_end end3; (void) end3; for (i = 1, it1 = begin1(p1); i <= 3; ++i, ++it1) assert(*it1 == i);