- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid reusing names reserved by the C++ standard.
by Roberto Bagnara 04 Nov '11

04 Nov '11

Module: ppl/ppl Branch: master Commit: 7682a06a0a07e2070438880368ef2d465fa71e38 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7682a06a0a07… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Nov 4 20:10:21 2011 +0100 Avoid reusing names reserved by the C++ standard. In the process, consistency improved with respect to conventions used throughout the library. Detected by ECLAIR service resvidnt. --- src/Bit_Row.defs.hh | 31 ++++++++++--------------------- src/Bit_Row.inlines.hh | 23 ++++++++++------------- src/Polyhedron_nonpublic.cc | 35 ++++++++++++++++++----------------- 3 files changed, 38 insertions(+), 51 deletions(-) diff --git a/src/Bit_Row.defs.hh b/src/Bit_Row.defs.hh index c876893..30984bc 100644 --- a/src/Bit_Row.defs.hh +++ b/src/Bit_Row.defs.hh @@ -85,24 +85,6 @@ bool subset_or_equal(const Bit_Row& x, const Bit_Row& y, #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) bool strict_subset(const Bit_Row& x, const Bit_Row& y); -#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Set-theoretic union. -/*! \relates Bit_Row */ -#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -void set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - -#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Set-theoretic intersection. -/*! \relates Bit_Row */ -#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -void set_intersection(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - -#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Set-theoretic difference. -/*! \relates Bit_Row */ -#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -void set_difference(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - } // namespace Parma_Polyhedra_Library #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS @@ -150,6 +132,16 @@ public: //! Clears all the bits of the row. void clear(); + //! Assigns to \p *this the set-theoretic union of \p x and \p y. + void union_assign(const Bit_Row& x, const Bit_Row& y); + + //! Assigns to \p *this the set-theoretic intersection of \p x and \p y. + void intersection_assign(const Bit_Row& x, const Bit_Row& y); + + //! Assigns to \p *this the set-theoretic difference of \p x and \p y. + void difference_assign(const Bit_Row& x, const Bit_Row& y); + + friend int compare(const Bit_Row& x, const Bit_Row& y); friend bool operator==(const Bit_Row& x, const Bit_Row& y); friend bool operator!=(const Bit_Row& x, const Bit_Row& y); @@ -157,9 +149,6 @@ public: friend bool subset_or_equal(const Bit_Row& x, const Bit_Row& y, bool& strict_subset); friend bool strict_subset(const Bit_Row& x, const Bit_Row& y); - friend void set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - friend void set_intersection(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); - friend void set_difference(const Bit_Row& x, const Bit_Row& y, Bit_Row& z); //! Returns the index of the first set bit or ULONG_MAX if no bit is set. unsigned long first() const; diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 3e815c3..c9882e3 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -126,39 +126,36 @@ Bit_Row::total_memory_in_bytes() const { return sizeof(*this) + external_memory_in_bytes(); } -/*! \relates Bit_Row */ inline void -set_union(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { +Bit_Row::union_assign(const Bit_Row& x, const Bit_Row& y) { const mp_size_t x_size = x.vec->_mp_size; PPL_ASSERT(x_size >= 0); const mp_size_t y_size = y.vec->_mp_size; PPL_ASSERT(y_size >= 0); if (x_size < y_size) { PPL_ASSERT(static_cast<unsigned long>(y_size) - <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(z.vec, y_size * PPL_BITS_PER_GMP_LIMB); - z.union_helper(x, y); + <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, y_size * PPL_BITS_PER_GMP_LIMB); + union_helper(x, y); } else { PPL_ASSERT(static_cast<unsigned long>(x_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(z.vec, x_size * PPL_BITS_PER_GMP_LIMB); - z.union_helper(y, x); + mpz_realloc2(vec, x_size * PPL_BITS_PER_GMP_LIMB); + union_helper(y, x); } } -/*! \relates Bit_Row */ inline void -set_intersection(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { - mpz_and(z.vec, x.vec, y.vec); +Bit_Row::intersection_assign(const Bit_Row& x, const Bit_Row& y) { + mpz_and(vec, x.vec, y.vec); } -/*! \relates Bit_Row */ inline void -set_difference(const Bit_Row& x, const Bit_Row& y, Bit_Row& z) { +Bit_Row::difference_assign(const Bit_Row& x, const Bit_Row& y) { PPL_DIRTY_TEMP(mpz_class, complement_y); mpz_com(complement_y.get_mpz_t(), y.vec); - mpz_and(z.vec, x.vec, complement_y.get_mpz_t()); + mpz_and(vec, x.vec, complement_y.get_mpz_t()); } namespace Implementation { diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index eaa2007..75e7564 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1145,7 +1145,7 @@ PPL::Polyhedron::strongly_minimize_constraints() const { if (cs[i].is_strict_inequality()) { // First, check if it is saturated by no closure points Bit_Row sat_ci; - set_union(sat[i], sat_lines_and_closure_points, sat_ci); + sat_ci.union_assign(sat[i], sat_lines_and_closure_points); if (sat_ci == sat_lines) { // It is saturated by no closure points. if (!found_eps_leq_one) { @@ -1181,8 +1181,9 @@ PPL::Polyhedron::strongly_minimize_constraints() const { // Now we check if there exists another strict inequality // constraint having a superset of its saturators, // when disregarding points. + /* FIXME: what is this clear for? */ sat_ci.clear(); - set_union(sat[i], sat_all_but_points, sat_ci); + sat_ci.union_assign(sat[i], sat_all_but_points); bool eps_redundant = false; for (dimension_type j = 0; j < cs_rows; ++j) if (i != j && cs[j].is_strict_inequality() @@ -1531,7 +1532,7 @@ PPL::Polyhedron::BHZ09_C_poly_hull_assign_if_exact(const Polyhedron& y) { const bool included = y.relation_with(x_cs[i]).implies(Poly_Con_Relation::is_included()); if (!included) { - set_union(x_gs_red_in_y, x_sat[i], row_union); + row_union.union_assign(x_gs_red_in_y, x_sat[i]); if (row_union != all_ones) return false; } @@ -1610,8 +1611,8 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { return true; Bit_Row x_nonpoints_nonred_in_y; - set_difference(x_gs_nonred_in_y, x_points_nonred_in_y, - x_nonpoints_nonred_in_y); + x_nonpoints_nonred_in_y.difference_assign(x_gs_nonred_in_y, + x_points_nonred_in_y); const Constraint_System& x_cs = x.con_sys; const Constraint_System& y_cs = y.con_sys; @@ -1655,20 +1656,20 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { // Skip constraint if it is not violated by `y'. if (y.relation_with(x_c).implies(Poly_Con_Relation::is_included())) continue; - set_difference(all_ones, x_sat[i], saturators); + saturators.difference_assign(all_ones, x_sat[i]); // Check condition 1. - set_intersection(x_nonpoints_nonred_in_y, saturators, tmp_set); + tmp_set.intersection_assign(x_nonpoints_nonred_in_y, saturators); if (!tmp_set.empty()) return false; if (x_c.is_strict_inequality()) { // Postpone check for condition 3. x_cs_condition_3.set(i); - set_intersection(x_closure_points, saturators, tmp_set); - set_union(x_gs_condition_3, tmp_set, x_gs_condition_3); + tmp_set.intersection_assign(x_closure_points, saturators); + x_gs_condition_3.union_assign(x_gs_condition_3, tmp_set); } else { // Check condition 2. - set_intersection(x_points_nonred_in_y_closure, saturators, tmp_set); + tmp_set.intersection_assign(x_points_nonred_in_y_closure, saturators); if (!tmp_set.empty()) return false; } @@ -1678,8 +1679,8 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { // (the statement of the NNC theorem in BHZ09 is symmetric). Bit_Row y_nonpoints_nonred_in_x; - set_difference(y_gs_nonred_in_x, y_points_nonred_in_x, - y_nonpoints_nonred_in_x); + y_nonpoints_nonred_in_x.difference_assign(y_gs_nonred_in_x, + y_points_nonred_in_x); // Filter away the points of `y_gs' that would be redundant // in the topological closure of `x'. @@ -1714,20 +1715,20 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { // Skip constraint if it is not violated by `x'. if (x.relation_with(y_c).implies(Poly_Con_Relation::is_included())) continue; - set_difference(all_ones, y_sat[i], saturators); + saturators.difference_assign(all_ones, y_sat[i]); // Check condition 1. - set_intersection(y_nonpoints_nonred_in_x, saturators, tmp_set); + tmp_set.intersection_assign(y_nonpoints_nonred_in_x, saturators); if (!tmp_set.empty()) return false; if (y_c.is_strict_inequality()) { // Postpone check for condition 3. y_cs_condition_3.set(i); - set_intersection(y_closure_points, saturators, tmp_set); - set_union(y_gs_condition_3, tmp_set, y_gs_condition_3); + tmp_set.intersection_assign(y_closure_points, saturators); + y_gs_condition_3.union_assign(y_gs_condition_3, tmp_set); } else { // Check condition 2. - set_intersection(y_points_nonred_in_x_closure, saturators, tmp_set); + tmp_set.intersection_assign(y_points_nonred_in_x_closure, saturators); if (!tmp_set.empty()) return false; }

1 0

[GIT] ppl/ppl(master): Scope of variables reduced.
by Roberto Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 246ba9a3d0b882797558e60536f486838aaaacf3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=246ba9a3d0b8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 3 20:38:48 2011 +0100 Scope of variables reduced. Detected by ECLAIR service minscope. --- src/Linear_Form.inlines.hh | 9 ++++----- src/checked.cc | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Linear_Form.inlines.hh b/src/Linear_Form.inlines.hh index 65ab261..2e0cfba 100644 --- a/src/Linear_Form.inlines.hh +++ b/src/Linear_Form.inlines.hh @@ -197,10 +197,10 @@ template <typename C> inline void Linear_Form<C>::ascii_dump(std::ostream& s) const { using namespace IO_Operators; + dimension_type space_dim = space_dimension(); + s << space_dim << "\n"; const char separator = ' '; - dimension_type space = space_dimension(); - s << space << "\n"; - for (dimension_type i = 0; i <= space; ++i) + for (dimension_type i = 0; i <= space_dim; ++i) s << vec[i] << separator; s << "\n"; } @@ -230,8 +230,7 @@ Linear_Form<C>::overflows() const { if (!inhomogeneous_term().is_bounded()) return true; - dimension_type dimension = space_dimension(); - for (dimension_type i = 0; i < dimension; ++i) { + for (dimension_type i = space_dimension(); i-- > 0; ) { if (!coefficient(Variable(i)).is_bounded()) return true; } diff --git a/src/checked.cc b/src/checked.cc index e886489..0e33f2a 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -219,9 +219,10 @@ parse_number_part(std::istream& is, number_struct& num) { return V_CVT_STR_UNK; if (c != '^') goto unexpected; - std::string::const_iterator i; num.base = 0; - for (i = num.mantissa.begin(); i != num.mantissa.end(); i++) { + for (std::string::const_iterator i = num.mantissa.begin(); + i != num.mantissa.end(); + i++) { num.base = num.base * 10 + get_digit(*i, 10); if (num.base > 36) goto unexpected;

1 0

[GIT] ppl/ppl(master): Code layout improved.
by Roberto Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 9ff6b157a31abe322be8f0ab89f993dbfff1521c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9ff6b157a31a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 3 20:38:31 2011 +0100 Code layout improved. --- src/Float.templates.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Float.templates.hh b/src/Float.templates.hh index 28147bf..c470ea6 100644 --- a/src/Float.templates.hh +++ b/src/Float.templates.hh @@ -158,8 +158,8 @@ void upper_bound_assign(std::map<dimension_type, typename FP_Linear_Form_Abstract_Store::iterator i1_end = ls1.end(); typename FP_Linear_Form_Abstract_Store::const_iterator i2_end = ls2.end(); while (i1 != i1_end) { - typename FP_Linear_Form_Abstract_Store::const_iterator i2 = - ls2.find(i1->first); + typename FP_Linear_Form_Abstract_Store::const_iterator + i2 = ls2.find(i1->first); if ((i2 == i2_end) || (i1->second != i2->second)) ls1.erase(i1++); else

1 0

[GIT] ppl/ppl(master): Simplified implementation.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: efed831cda3f447da48885d3a3f52282d5abc4a4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=efed831cda3f… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 19:57:23 2011 +0100 Simplified implementation. --- src/math_utilities.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/math_utilities.inlines.hh b/src/math_utilities.inlines.hh index 550156c..db38860 100644 --- a/src/math_utilities.inlines.hh +++ b/src/math_utilities.inlines.hh @@ -44,7 +44,7 @@ template <typename T> inline T low_bits_mask(const unsigned n) { PPL_ASSERT(n < unsigned(std::numeric_limits<T>::digits)); - return (n == 0) ? 0 : ~(~(T(0u)) << n); + return ~((~static_cast<T>(0)) << n); } template <typename T>

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions reducing size of underlying type.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 9954d6d0b6f5a88175c0f00eb0aae767d862dc4b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9954d6d0b6f5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:33:35 2011 +0100 Avoid implicit conversions reducing size of underlying type. Detected by ECLAIR service utypflag. --- src/checked_int.inlines.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index 10ab8da..c45f306 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -662,14 +662,14 @@ assign_unsigned_int_mpz(To& to, const mpz_class& from, Rounding_Dir dir) { return set_neg_overflow_int<To_Policy>(to, dir); if (sizeof(To) <= sizeof(unsigned long)) { if (!To_Policy::check_overflow) { - to = from.get_ui(); + to = static_cast<To>(from.get_ui()); return V_EQ; } if (from.fits_ulong_p()) { unsigned long v = from.get_ui(); if (PPL_GT_SILENT(v, (Extended_Int<To_Policy, To>::max))) return set_pos_overflow_int<To_Policy>(to, dir); - to = v; + to = static_cast<To>(v); return V_EQ; } }

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion reducing size of underlying type.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: ba6a021a1ac94a6d97e6600e1bc4e710861160d3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba6a021a1ac9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:32:14 2011 +0100 Avoid implicit conversion reducing size of underlying type. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 3d2a386..4b4fa1e 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -313,7 +313,7 @@ PPL::Bit_Row::union_helper(const Bit_Row& y, const Bit_Row& z) { mp_size_t z_size = z.vec->_mp_size; PPL_ASSERT(y_size <= z_size); PPL_ASSERT(vec->_mp_alloc >= z_size); - vec->_mp_size = z_size; + vec->_mp_size = z.vec->_mp_size; mp_srcptr yp = y.vec->_mp_d; mp_srcptr zp = z.vec->_mp_d; mp_ptr p = vec->_mp_d;

1 0

[GIT] ppl/ppl(master): Removed redundant cast.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 1d68cfff17ee1fd649a2a012b6352f6d9b944280 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1d68cfff17ee… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:06:57 2011 +0100 Removed redundant cast. Detected by ECLAIR service castexpr. --- src/meta_programming.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/meta_programming.hh b/src/meta_programming.hh index 2e19d84..efffa29 100644 --- a/src/meta_programming.hh +++ b/src/meta_programming.hh @@ -120,8 +120,7 @@ struct Compile_Time_Check<true> { enum anonymous_enum_compile_time_check_ ## suffix { \ /* If e evaluates to false, then the sizeof cannot be compiled. */ \ PPL_COMPILE_TIME_CHECK_NAME(suffix) \ - = sizeof(Parma_Polyhedra_Library:: \ - Compile_Time_Check<static_cast<bool>(e)>) \ + = sizeof(Parma_Polyhedra_Library::Compile_Time_Check<e>) \ } #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS

1 0

[GIT] ppl/ppl(master): Removed several redundant casts.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 52514333875c79ba71b0f40559c79b0430a61eaa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=52514333875c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:06:03 2011 +0100 Removed several redundant casts. Detected by ECLAIR service castexpr. --- src/checked.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index 8d4ac29..e886489 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -210,7 +210,7 @@ parse_number_part(std::istream& is, number_struct& num) { case BASE: if (get_digit(c, 10) >= 0) { if (c != '0' || !num.mantissa.empty()) - num.mantissa += (char) c; + num.mantissa += c; empty_mantissa = false; break; } @@ -238,7 +238,7 @@ parse_number_part(std::istream& is, number_struct& num) { case INTEGER: if (get_digit(c, num.base) >= 0) { if (c != '0' || !num.mantissa.empty()) - num.mantissa += (char) c; + num.mantissa += c; empty_mantissa = false; break; } @@ -252,7 +252,7 @@ parse_number_part(std::istream& is, number_struct& num) { if (get_digit(c, num.base) >= 0) { --exponent_offset; if (c != '0' || !num.mantissa.empty()) - num.mantissa += (char) c; + num.mantissa += c; empty_mantissa = false; break; }

1 0

[GIT] ppl/ppl(master): Removed a few redundant casts.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 2ef798d06d7cd127971bcdbf4c7ce2ca90cece65 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ef798d06d7c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 17:55:05 2011 +0100 Removed a few redundant casts. Detected by ECLAIR service castexpr. --- src/Grid_Generator_System.cc | 5 +++-- src/Grid_nonpublic.cc | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Grid_Generator_System.cc b/src/Grid_Generator_System.cc index 9945b63..0f1aed9 100644 --- a/src/Grid_Generator_System.cc +++ b/src/Grid_Generator_System.cc @@ -319,9 +319,10 @@ PPL::Grid_Generator_System // Swap the parameter divisor column into the new last column. swap_columns(col, col + dims); // Set the diagonal element of each added rows. - dimension_type num_rows = this->num_rows(); + Grid_Generator_System& x = *this; + const dimension_type num_rows = x.num_rows(); for (dimension_type row = num_rows - dims; row < num_rows; ++row, ++col) - const_cast<Coefficient&>((*this)[row][col]) = 1; + x[row][col] = 1; } void diff --git a/src/Grid_nonpublic.cc b/src/Grid_nonpublic.cc index b00088d..39c09ee 100644 --- a/src/Grid_nonpublic.cc +++ b/src/Grid_nonpublic.cc @@ -62,7 +62,7 @@ PPL::Grid::construct(dimension_type num_dimensions, // dimension and then store it in `con_sys'. Congruence_System cgs(Congruence::zero_dim_false()); cgs.increase_space_dimension(space_dim); - const_cast<Congruence_System&>(con_sys).swap(cgs); + con_sys.swap(cgs); PPL_ASSERT(OK()); return; @@ -456,7 +456,7 @@ PPL::Grid::set_empty() { // dimension and then swap it with `con_sys'. Congruence_System cgs(Congruence::zero_dim_false()); cgs.increase_space_dimension(space_dim); - const_cast<Congruence_System&>(con_sys).swap(cgs); + con_sys.swap(cgs); } void

1 0

[GIT] ppl/ppl(master): Use consistently get_digit.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 3082a84e1fdbfad1cc17280aa047bfaff8ea0130 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3082a84e1fdb… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 16:26:45 2011 +0100 Use consistently get_digit. --- src/checked.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index d1a8aed..8d4ac29 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -222,7 +222,7 @@ parse_number_part(std::istream& is, number_struct& num) { std::string::const_iterator i; num.base = 0; for (i = num.mantissa.begin(); i != num.mantissa.end(); i++) { - num.base = num.base * 10 + (*i - '0'); + num.base = num.base * 10 + get_digit(*i, 10); if (num.base > 36) goto unexpected; }

1 0