February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid implicit conversion changing signedness.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: aa5200686cc9d529a5e9b23869e8c8d882174f94 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa5200686cc9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 15:21:04 2012 +0100 Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- src/checked_float.inlines.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 192926e..ae6373f 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -881,7 +881,8 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { } unsigned int needed_bits = Float<T>::Binary::MANTISSA_BITS + 1; if (exponent < Float<T>::Binary::EXPONENT_MIN) - needed_bits -= Float<T>::Binary::EXPONENT_MIN - exponent; + needed_bits -= static_cast<unsigned int>(Float<T>::Binary::EXPONENT_MIN + - exponent); mpz_t mantissa; mpz_init(mantissa); long shift = static_cast<long>(needed_bits) - exponent;

1 0

[GIT] ppl/ppl(master): Removed a couple of useless explicit casts.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 76489dec6c233a03f13706fb58b3b370c20fe412 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=76489dec6c23… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 15:13:34 2012 +0100 Removed a couple of useless explicit casts. --- src/checked_float.inlines.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 03e1bc7..192926e 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -872,7 +872,7 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { else return round_gt_float<To_Policy>(to, dir); } - if (exponent > int(Float<T>::Binary::EXPONENT_MAX + 1)) { + if (exponent > Float<T>::Binary::EXPONENT_MAX + 1) { overflow: if (sign < 0) return set_neg_overflow_float<To_Policy>(to, dir); @@ -905,7 +905,7 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { } else --exponent; - if (exponent > int(Float<T>::Binary::EXPONENT_MAX)) { + if (exponent > Float<T>::Binary::EXPONENT_MAX) { mpz_clear(mantissa); goto overflow; }

1 0

[GIT] ppl/ppl(master): When working with sizes, prefer vector::resize() to vector::erase().
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 8aa0c5de6606f30b40a31e74b7a8c10180af8ffe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8aa0c5de6606… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 14:53:40 2012 +0100 When working with sizes, prefer vector::resize() to vector::erase(). Added helper function nth_iter(). --- src/Bit_Matrix.cc | 2 +- src/Bit_Matrix.inlines.hh | 2 +- src/Box.templates.hh | 2 +- src/DB_Matrix.templates.hh | 2 +- src/Dense_Matrix.cc | 2 +- src/Dense_Matrix.inlines.hh | 2 +- src/Grid_chdims.cc | 4 ++-- src/Linear_System.cc | 4 ++-- src/MIP_Problem.inlines.hh | 4 ++-- src/PIP_Problem.cc | 2 +- src/PIP_Tree.cc | 6 +++--- src/globals.defs.hh | 8 ++++++++ src/globals.inlines.hh | 14 ++++++++++++++ 13 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/Bit_Matrix.cc b/src/Bit_Matrix.cc index 96243f7..2d0f107 100644 --- a/src/Bit_Matrix.cc +++ b/src/Bit_Matrix.cc @@ -137,7 +137,7 @@ PPL::Bit_Matrix::resize(dimension_type new_n_rows, } else if (new_n_rows < old_num_rows) // Drop some rows. - rows.erase(rows.begin() + new_n_rows, rows.end()); + rows.resize(new_n_rows); PPL_ASSERT(OK()); } diff --git a/src/Bit_Matrix.inlines.hh b/src/Bit_Matrix.inlines.hh index dfd2b03..39f614f 100644 --- a/src/Bit_Matrix.inlines.hh +++ b/src/Bit_Matrix.inlines.hh @@ -63,7 +63,7 @@ Bit_Matrix::remove_trailing_rows(const dimension_type n) { // than the actual number of the rows of the matrix. PPL_ASSERT(n <= rows.size()); if (n != 0) - rows.erase(rows.end() - n, rows.end()); + rows.resize(rows.size() - n); PPL_ASSERT(OK()); } diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 66357af..d67c7d8 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -2062,7 +2062,7 @@ Box<ITV>::remove_higher_space_dimensions(const dimension_type new_dim) { return; } - seq.erase(seq.begin() + new_dim, seq.end()); + seq.resize(new_dim); PPL_ASSERT(OK()); } diff --git a/src/DB_Matrix.templates.hh b/src/DB_Matrix.templates.hh index 374c9ad..e03974d 100644 --- a/src/DB_Matrix.templates.hh +++ b/src/DB_Matrix.templates.hh @@ -178,7 +178,7 @@ DB_Matrix<T>::resize_no_copy(const dimension_type new_n_rows) { } else if (new_n_rows < old_n_rows) { // Drop some rows. - rows.erase(rows.begin() + new_n_rows, rows.end()); + rows.resize(new_n_rows); // Shrink the existing rows. for (dimension_type i = new_n_rows; i-- > 0; ) rows[i].shrink(new_n_rows); diff --git a/src/Dense_Matrix.cc b/src/Dense_Matrix.cc index f7d132a..b702765 100644 --- a/src/Dense_Matrix.cc +++ b/src/Dense_Matrix.cc @@ -294,7 +294,7 @@ PPL::Dense_Matrix::resize_no_copy(const dimension_type new_n_rows, } else if (new_n_rows < old_n_rows) { // Drop some rows. - rows.erase(rows.begin() + new_n_rows, rows.end()); + rows.resize(new_n_rows); old_n_rows = new_n_rows; } // Here we have the right number of rows. diff --git a/src/Dense_Matrix.inlines.hh b/src/Dense_Matrix.inlines.hh index c43ae82..0bac033 100644 --- a/src/Dense_Matrix.inlines.hh +++ b/src/Dense_Matrix.inlines.hh @@ -190,7 +190,7 @@ inline void Dense_Matrix::remove_trailing_rows(const dimension_type n) { PPL_ASSERT(n <= rows.size()); if (n != 0) - rows.erase(rows.end() - n, rows.end()); + rows.resize(rows.size() - n); PPL_ASSERT(OK()); } diff --git a/src/Grid_chdims.cc b/src/Grid_chdims.cc index 2b7af92..e6731c7 100644 --- a/src/Grid_chdims.cc +++ b/src/Grid_chdims.cc @@ -351,7 +351,7 @@ PPL::Grid::remove_higher_space_dimensions(const dimension_type new_dimension) { gen_sys.remove_trailing_rows(num_redundant); gen_sys.unset_pending_rows(); } - dim_kinds.erase(dim_kinds.begin() + new_dimension + 1, dim_kinds.end()); + dim_kinds.resize(new_dimension + 1); // TODO: Consider if it is worth also preserving the congruences // if they are also in minimal form. } @@ -383,7 +383,7 @@ PPL::Grid::remove_higher_space_dimensions(const dimension_type new_dimension) { // form. con_sys.remove_trailing_rows(num_redundant); } - dim_kinds.erase(dim_kinds.begin() + new_dimension + 1, dim_kinds.end()); + dim_kinds.resize(new_dimension + 1); clear_generators_up_to_date(); // Replace gen_sys with an empty system of the right dimension. // Extra 2 columns for inhomogeneous term and modulus. diff --git a/src/Linear_System.cc b/src/Linear_System.cc index 506b507..f8a3e8c 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -337,8 +337,8 @@ PPL::Linear_System::sort_rows(const dimension_type first_row, PPL_ASSERT(first_row >= first_pending_row() || last_row <= first_pending_row()); // First sort without removing duplicates. - std::vector<Dense_Row>::iterator first = rows.begin() + first_row; - std::vector<Dense_Row>::iterator last = rows.begin() + last_row; + std::vector<Dense_Row>::iterator first = nth_iter(rows, first_row); + std::vector<Dense_Row>::iterator last = nth_iter(rows, last_row); Implementation::swapping_sort(first, last, Row_Less_Than()); // Second, move duplicates to the end. std::vector<Dense_Row>::iterator new_last diff --git a/src/MIP_Problem.inlines.hh b/src/MIP_Problem.inlines.hh index 1d6954f..df09249 100644 --- a/src/MIP_Problem.inlines.hh +++ b/src/MIP_Problem.inlines.hh @@ -111,7 +111,7 @@ MIP_Problem::~MIP_Problem() { // NOTE: do NOT delete inherited constraints; they are owned // (and will eventually be deleted) by ancestors. for (Constraint_Sequence::const_iterator - i = input_cs.begin() + inherited_constraints, + i = nth_iter(input_cs, inherited_constraints), i_end = input_cs.end(); i != i_end; ++i) delete *i; } @@ -217,7 +217,7 @@ MIP_Problem::external_memory_in_bytes() const { // NOTE: disregard inherited constraints, as they are owned by ancestors. n += input_cs.capacity() * sizeof(Constraint*); for (Constraint_Sequence::const_iterator - i = input_cs.begin() + inherited_constraints, + i = nth_iter(input_cs, inherited_constraints), i_end = input_cs.end(); i != i_end; ++i) n += ((*i)->total_memory_in_bytes()); diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 682120b..9c82202 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -132,7 +132,7 @@ PPL::PIP_Problem::solve() const { // Go through all pending constraints. for (Constraint_Sequence::const_iterator - cs_i = input_cs.begin() + first_pending_constraint, + cs_i = nth_iter(input_cs, first_pending_constraint), cs_end = input_cs.end(); cs_i != cs_end; ++cs_i) { const Constraint& c = *cs_i; const dimension_type c_space_dim = c.space_dimension(); diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index b7dbbb2..76b5a0d 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2223,8 +2223,8 @@ PIP_Solution_Node::update_tableau( Need to insert the original variable id before the slack variable id's to respect variable ordering. */ - basis.insert(basis.begin() + new_var_column, true); - mapping.insert(mapping.begin() + new_var_column, new_var_column); + basis.insert(nth_iter(basis, new_var_column), true); + mapping.insert(nth_iter(mapping, new_var_column), new_var_column); // Update variable id's of slack variables. for (dimension_type j = var_row.size(); j-- > 0; ) if (var_row[j] >= new_var_column) @@ -2252,7 +2252,7 @@ PIP_Solution_Node::update_tableau( Coefficient_traits::const_reference denom = tableau.denominator(); for (Constraint_Sequence::const_iterator - c_iter = input_cs.begin() + first_pending_constraint, + c_iter = nth_iter(input_cs, first_pending_constraint), c_end = input_cs.end(); c_iter != c_end; ++c_iter) { const Constraint& constraint = *c_iter; // (Tentatively) Add new rows to s and t matrices. diff --git a/src/globals.defs.hh b/src/globals.defs.hh index 6c592ed..314194d 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -489,6 +489,14 @@ check_space_dimension_overflow(dimension_type dim, const char* method, const char* reason); +template <typename RA_Container> +typename RA_Container::iterator +nth_iter(RA_Container& cont, dimension_type n); + +template <typename RA_Container> +typename RA_Container::const_iterator +nth_iter(const RA_Container& cont, dimension_type n); + } // namespace Parma_Polyhedra_Library // By default, use sparse matrices both for MIP_Problem and PIP_Problem. diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index ce6c30d..09936ec 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -128,6 +128,20 @@ is_space(char c) { return isspace(c) != 0; } +template <typename RA_Container> +inline typename RA_Container::iterator +nth_iter(RA_Container& cont, dimension_type n) { + typedef typename RA_Container::difference_type diff_t; + return cont.begin() + static_cast<diff_t>(n); +} + +template <typename RA_Container> +inline typename RA_Container::const_iterator +nth_iter(const RA_Container& cont, dimension_type n) { + typedef typename RA_Container::difference_type diff_t; + return cont.begin() + static_cast<diff_t>(n); +} + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_globals_inlines_hh)

1 0

[GIT] ppl/ppl(master): Fixed implementation defined implicit cast.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 5e2ed9a48ac7e6bf2f68b5395791f4e7f4379e19 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e2ed9a48ac7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 14:30:27 2012 +0100 Fixed implementation defined implicit cast. Detected by ECLAIR service utypflag. --- src/OR_Matrix.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 2bc43b5..448bc0b 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -243,14 +243,14 @@ template <typename T> template <typename U> inline typename OR_Matrix<T>::template any_row_iterator<U>& OR_Matrix<T>::any_row_iterator<U>::operator+=(const difference_type m) { - difference_type increment = m + m*m/2 + m*e; + difference_type increment = m + m * m / 2 + m * static_cast<difference_type>(e); if (e % 2 == 0 && m % 2 != 0) ++increment; - e += m; - i += increment; + e = static_cast<dimension_type>(static_cast<difference_type>(e) + m); + i = static_cast<dimension_type>(static_cast<difference_type>(i) + increment); value.first += increment; #if PPL_OR_MATRIX_EXTRA_DEBUG - value.size_ += (m - m%2); + value.size_ = static_cast<dimension_type>(static_cast<difference_type>(value.size_) + m - m % 2); #endif return *this; }

1 0

[GIT] ppl/ppl(master): Silenced a warning.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 0f2a2bf8ff3f23db8c7d4607d1abc3c963e89eca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f2a2bf8ff3f… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 14:30:22 2012 +0100 Silenced a warning. --- src/wrap_assign.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/wrap_assign.hh b/src/wrap_assign.hh index 6294e4b..bcc9197 100644 --- a/src/wrap_assign.hh +++ b/src/wrap_assign.hh @@ -312,7 +312,7 @@ wrap_assign(PSET& pointset, Coefficient& quadrants = u_d; quadrants = last_quadrant - first_quadrant + 1; - unsigned extension; + PPL_UNINITIALIZED(unsigned, extension); Result res = assign_r(extension, quadrants, ROUND_IGNORE); if (result_overflow(res) != 0 || extension > complexity_threshold) goto set_full_range;

1 0

[GIT] ppl/ppl(master): Fixed implementation defined implicit cast.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: aea1d036a659bb31d25e382a7e215a59e3e557da URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aea1d036a659… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 12:34:21 2012 +0100 Fixed implementation defined implicit cast. Detected by ECLAIR service utypflag. --- src/Linear_Form.templates.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index b2305f0..aa52658 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -422,11 +422,11 @@ Linear_Form<C>::relative_error( C error_propagator; // We assume that f_base is a power of 2. - int power = msb_position(f_base) * (-f_mantissa_bits); - analyzer_format lb = -static_cast<analyzer_format>(ldexp(1.0, power)); + int power = static_cast<int>(msb_position(f_base) * f_mantissa_bits); + analyzer_format lb = static_cast<analyzer_format>(ldexp(1.0, -power)); - error_propagator.build(i_constraint(GREATER_OR_EQUAL, lb), - i_constraint(LESS_OR_EQUAL, -lb)); + error_propagator.build(i_constraint(GREATER_OR_EQUAL, -lb), + i_constraint(LESS_OR_EQUAL, lb)); // Handle the inhomogeneous term. const C* current_term = &inhomogeneous_term();

1 0

[GIT] ppl/ppl(master): Delimit pseudo-code in non-Doxygen comments within < CODE> </CODE>. Comments improved.
by Roberto Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 92d3b0df6261f177871ee667186d2c73bb1141d5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=92d3b0df6261… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 11:02:30 2012 +0100 Delimit pseudo-code in non-Doxygen comments within <CODE> </CODE>. Comments improved. --- src/MIP_Problem.cc | 11 +++++++---- src/Octagonal_Shape.templates.hh | 11 +++++++---- src/PIP_Tree.cc | 6 ++++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 83eeeb8..9eb8022 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1685,10 +1685,13 @@ PPL::MIP_Problem::erase_artificials(const dimension_type begin_artificials, // ... then properly set the element in the (new) last column, // encoding the kind of optimization; ... { - // This block is equivalent to: - // working_cost[new_last_column] = working_cost.get(old_last_column); - // But it avoids storing zeroes. - + // This block is equivalent to + // + // <CODE> + // working_cost[new_last_column] = working_cost.get(old_last_column); + // </CODE> + // + // but it avoids storing zeroes. Coefficient_traits::const_reference old_cost = working_cost.get(old_last_column); if (old_cost == 0) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 1e4a0b8..b029054 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1305,7 +1305,7 @@ Octagonal_Shape<T>::frequency(const Linear_Expression& expr, // and return true. Otherwise the values for \p expr // are not discrete so return false. - // Space dimension = 0: if empty, then return false; + // Space dimension is 0: if empty, then return false; // otherwise the frequency is 0 and the value is the inhomogeneous term. if (space_dim == 0) { if (is_empty()) @@ -2447,9 +2447,12 @@ Octagonal_Shape<T>::strong_closure_assign() const { // Unfolding two iterations on `j': this ensures that // the loop exit condition `j <= i' is OK. for (dimension_type j = 0; j <= i; ) { - // First iteration: - // sum1 = x_i_k + x_k_j == x_ck_ci + x_k_j; - // sum2 = x_i_ck + x_ck_j == x_k_ci + x_ck_j. + // First iteration: compute + // + // <CODE> + // sum1 = x_i_k + x_k_j == x_ck_ci + x_k_j; + // sum2 = x_i_ck + x_ck_j == x_k_ci + x_ck_j; + // </CODE> add_assign_r(sum1, vec_ck_ci, vec_k[j], ROUND_UP); add_assign_r(sum2, vec_k_ci, vec_ck[j], ROUND_UP); min_assign(sum1, sum2); diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index b091292..b7dbbb2 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -257,7 +257,8 @@ column_lower(const Matrix& tableau, const dimension_type num_vars = mapping.size(); dimension_type k = 0; // While loop guard is: (k < num_rows && lhs == rhs). - // Return value is false, if k >= num_rows; lhs < rhs, otherwise. + // Return value is false, if k >= num_rows; it is equivalent to + // lhs < rhs, otherwise. // Try to optimize the computation of lhs and rhs. while (true) { const dimension_type mk = mapping[k]; @@ -282,7 +283,8 @@ column_lower(const Matrix& tableau, } // Optimizing for: lhs == 0 && rhs == 0; continue; - } else { + } + else { // Not in base. const Row& t_mk = tableau[mk]; Coefficient_traits::const_reference t_mk_ja = t_mk.get(ja);

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing type signedness.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 6b48ffdf47e595250802fe87464fe348bc488d45 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6b48ffdf47e5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 10:13:34 2012 +0100 Avoid implicit conversions changing type signedness. Detected by ECLAIR service utypflag. --- src/c_streambuf.cc | 14 ++++++++++---- src/c_streambuf.defs.hh | 1 + src/stdiobuf.cc | 12 +++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/c_streambuf.cc b/src/c_streambuf.cc index 83ecf0f..c76ca44 100644 --- a/src/c_streambuf.cc +++ b/src/c_streambuf.cc @@ -23,6 +23,8 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl-config.h" #include "c_streambuf.defs.hh" +#include "globals.defs.hh" +#include "assert.hh" namespace Parma_Polyhedra_Library { @@ -48,22 +50,24 @@ c_streambuf::underflow() { std::streamsize c_streambuf::xsgetn(char_type* s, std::streamsize n) { + PPL_ASSERT(n >= 0); if (n == 0) return n; const int_type eof = traits_type::eof(); - int a; + const size_t sz_n = static_cast<size_t>(n); + size_t a; if (traits_type::eq_int_type(next_char_buf, eof)) a = 0; else { s[0] = static_cast<char_type>(next_char_buf); a = 1; } - std::streamsize r = cb_read(s + a, n - a) + a; + const size_t r = cb_read(s + a, sz_n - a) + a; if (r > 0) unget_char_buf = traits_type::to_int_type(s[r - 1]); else unget_char_buf = traits_type::eof(); - return r; + return static_cast<std::streamsize>(r); } c_streambuf::int_type @@ -76,7 +80,9 @@ c_streambuf::pbackfail(int_type c) { std::streamsize c_streambuf::xsputn(const char_type* s, std::streamsize n) { - return cb_write(s, n); + PPL_ASSERT(n >= 0); + size_t r = cb_write(s, static_cast<size_t>(n)); + return static_cast<std::streamsize>(r); } c_streambuf::int_type diff --git a/src/c_streambuf.defs.hh b/src/c_streambuf.defs.hh index b8e0d98..2a349af 100644 --- a/src/c_streambuf.defs.hh +++ b/src/c_streambuf.defs.hh @@ -26,6 +26,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "c_streambuf.types.hh" #include <streambuf> +#include <cstddef> class Parma_Polyhedra_Library::c_streambuf : public std::basic_streambuf<char, std::char_traits<char> > { diff --git a/src/stdiobuf.cc b/src/stdiobuf.cc index 529f1bf..8a5fe95 100644 --- a/src/stdiobuf.cc +++ b/src/stdiobuf.cc @@ -23,6 +23,9 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl-config.h" #include "stdiobuf.defs.hh" +#include "globals.defs.hh" +#include "assert.hh" +#include <cstddef> namespace Parma_Polyhedra_Library { @@ -40,12 +43,13 @@ stdiobuf::underflow() { std::streamsize stdiobuf::xsgetn(char_type* s, std::streamsize n) { - std::streamsize r = fread(s, 1, n, fp); + PPL_ASSERT(n >= 0); + size_t r = fread(s, 1, static_cast<size_t>(n), fp); if (r > 0) unget_char_buf = traits_type::to_int_type(s[r - 1]); else unget_char_buf = traits_type::eof(); - return r; + return static_cast<std::streamsize>(r); } stdiobuf::int_type @@ -58,7 +62,9 @@ stdiobuf::pbackfail(int_type c) { std::streamsize stdiobuf::xsputn(const char_type* s, std::streamsize n) { - return fwrite(s, 1, n, fp); + PPL_ASSERT(n >= 0); + size_t r = fwrite(s, 1, static_cast<size_t>(n), fp); + return static_cast<std::streamsize>(r); } stdiobuf::int_type

1 0

[GIT] ppl/ppl(master): New commits
by Roberto Bagnara 24 Feb '12

24 Feb '12

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=223fd2c798b1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:38:19 2012 +0100 Delimit pseudo-code in non-Doxygen comments within <CODE> </CODE>. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=91385ebcf630… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:36:40 2012 +0100 Delimit pseudo-code in Doxygen comments within <CODE> </CODE>. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a2da2d0f8f30… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:33:00 2012 +0100 Comment improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f52a31d61c17… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:32:02 2012 +0100 Delimit pseudo-code in non-Doxygen comments within <CODE> </CODE>. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=52fe00dd2c21… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:30:49 2012 +0100 Comment improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=267192b35291… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:30:28 2012 +0100 Comments improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c91de8d4cae1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:30:10 2012 +0100 Delimit pseudo-code in non-Doxygen comments within <CODE> </CODE>. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37a29dcd0c52… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:29:35 2012 +0100 Comment improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f874d7e44a23… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:24:31 2012 +0100 Delimit pseudo-code in non-Doxygen comments within <CODE> </CODE>. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3a576ab2ae6a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:23:35 2012 +0100 Comment improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3d706287150d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:19:43 2012 +0100 Delimit example code in non-Doxygen comments within <CODE> </CODE>. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e97c62dec8e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 09:19:09 2012 +0100 Comments fixed/improved.

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing type signedness.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 05f9cc35b6a68f506206d89fa4fe2103349c5650 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=05f9cc35b6a6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 09:33:43 2012 +0100 Avoid implicit conversions changing type signedness. Detected by ECLAIR service utypflag. --- src/Row_Flags.cc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Row_Flags.cc b/src/Row_Flags.cc index 62e1f29..39a3c8c 100644 --- a/src/Row_Flags.cc +++ b/src/Row_Flags.cc @@ -32,11 +32,13 @@ void PPL::Row_Flags::ascii_dump(std::ostream& s) const { s << "0x"; std::istream::fmtflags f = s.setf(std::istream::hex); - std::streamsize sz = s.width(2*sizeof(Row_Flags::base_type)); + const std::streamsize new_sz + = static_cast<std::streamsize>(2 * sizeof(Row_Flags::base_type)); + const std::streamsize old_sz = s.width(new_sz); std::ostream::char_type ch = s.fill('0'); s << bits; s.fill(ch); - s.width(sz); + s.width(old_sz); s.flags(f); }

1 0