- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added helper method insert_precise_aux to avoid recursive call.
by Enea Zaffanella 17 Aug '12

17 Aug '12

Module: ppl/ppl Branch: master Commit: 0873d966a21ec85959b2d8274e9e3ac561a3a09f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0873d966a21e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Aug 17 17:13:39 2012 +0200 Added helper method insert_precise_aux to avoid recursive call. Detected by ECLAIR service funrecsn. --- src/CO_Tree.cc | 70 +++++++++++++++++++++++++++++--------------------- src/CO_Tree.defs.hh | 11 ++++++++ 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index cbc1d50..68d49d4 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -357,54 +357,69 @@ PPL::CO_Tree::insert_precise(dimension_type key1, PPL_ASSERT(!empty()); #ifndef NDEBUG + // Check that `itr' is a correct hint. tree_iterator itr2(*this); itr2.go_down_searching_key(key1); PPL_ASSERT(itr == itr2); #endif if (itr.index() == key1) { + // Replacement, rather than insertion. *itr = data1; PPL_ASSERT(OK()); return itr; } - if (data <= &data1 && &data1 < data + (reserved_size + 1)) { - // data1 is a coefficient of this row. - // Avoid invalidating it. - data_type x = data1; + // Proper insertion: check if it would invalidate `data1'. + const bool invalidating + = (data <= &data1) && (&data1 < data + (reserved_size + 1)); + + if (!invalidating) + return insert_precise_aux(key1, data1, itr); + + // `data1' could be invalidated by the insert, because it is + // a coefficient of this row. Avoid the issue by copying it. + data_type data1_copy = data1; #ifndef NDEBUG - dimension_type i = &data1 - data; - dimension_type key2 = indexes[i]; - PPL_ASSERT(key2 != unused_index); - // This is true since key1 is not in the tree. - PPL_ASSERT(key2 != key1); + dimension_type i = &data1 - data; + dimension_type key2 = indexes[i]; + PPL_ASSERT(key2 != unused_index); + // This is true since `key1' is not in the tree. + PPL_ASSERT(key2 != key1); #endif - // Insert a dummy coefficient. - // NOTE: This may invalidate data1, because it may reallocate the tree - // and/or move coefficients during rebalancing). - itr = insert_precise(key1, Coefficient_zero(), itr); + // Insert a dummy coefficient. + // NOTE: this may invalidate `data1', because it may reallocate the tree + // and/or move coefficients during rebalancing. + itr = insert_precise_aux(key1, Coefficient_zero(), itr); - PPL_ASSERT(itr.index() == key1); + PPL_ASSERT(itr.index() == key1); - using std::swap; + // Swap the correct coefficient in place. + using std::swap; + swap(*itr, data1_copy); - // Swap the correct coefficient in place. - swap(*itr, x); + PPL_ASSERT(OK()); + return itr; +} - PPL_ASSERT(OK()); - return itr; - } +PPL::CO_Tree::tree_iterator +PPL::CO_Tree::insert_precise_aux(dimension_type key1, + data_type_const_reference data1, + tree_iterator itr) { + PPL_ASSERT(key1 != unused_index); + PPL_ASSERT(!empty()); + // This is a proper insert. + PPL_ASSERT(itr.index() != key1); + // `data1' is not going to be invalidated. + PPL_ASSERT(!(data <= &data1 && &data1 < data + (reserved_size + 1))); if (is_greater_than_ratio(size_ + 1, reserved_size, max_density_percent)) { - rebuild_bigger_tree(); - - // itr was invalidated by the rebuild operation + // `itr' was invalidated by the rebuild operation itr.get_root(); itr.go_down_searching_key(key1); - PPL_ASSERT(itr.index() != key1); } @@ -423,13 +438,10 @@ PPL::CO_Tree::insert_precise(dimension_type key1, new (&(*itr)) data_type(data1); // Set the index only if the construction was successful. itr.index() = key1; - - } else { - + } + else { itr = rebalance(itr, key1, data1); - itr.go_down_searching_key(key1); - PPL_ASSERT(itr.index() == key1); } PPL_ASSERT(OK()); diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index d02b467..c09f6f8 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -954,6 +954,17 @@ private: data_type_const_reference data, tree_iterator itr); + //! Helper for \c insert_precise. + /*! + This helper method takes the same arguments as \c insert_precise, + but besides assuming that \p itr is a correct hint, it also assumes + that \p key and \p data are not in the tree; namely, a proper + insertion has to be done and the insertion can not invalidate \p data. + */ + tree_iterator insert_precise_aux(dimension_type key, + data_type_const_reference data, + tree_iterator itr); + //! Inserts an element in the tree. /*!

1 0

[GIT] ppl/ppl(master): Added several missing <CODE> tags in Doxygen comments.
by Enea Zaffanella 17 Aug '12

17 Aug '12

Module: ppl/ppl Branch: master Commit: 076f771d01f2c38f0aaf1b586befb63dd5a4aea8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=076f771d01f2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Aug 17 09:11:18 2012 +0200 Added several missing <CODE> tags in Doxygen comments. --- src/Generator.defs.hh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Generator.defs.hh b/src/Generator.defs.hh index 5f82e51..7f1d0c7 100644 --- a/src/Generator.defs.hh +++ b/src/Generator.defs.hh @@ -827,7 +827,7 @@ bool operator!=(const Generator& x, const Generator& y); The direction of the approximation is specified by \p dir. All computations are performed using variables of type - Checked_Number<To, Extended_Number_Policy>. + <CODE>Checked_Number\<To, Extended_Number_Policy\></CODE>. \note Distances are \e only defined between generators that are points and/or @@ -848,7 +848,7 @@ bool rectilinear_distance_assign(Checked_Number<To, Extended_Number_Policy>& r, The direction of the approximation is specified by \p dir. All computations are performed using variables of type - Checked_Number<Temp, Extended_Number_Policy>. + <CODE>Checked_Number\<Temp, Extended_Number_Policy\></CODE>. \note Distances are \e only defined between generators that are points and/or @@ -893,7 +893,7 @@ bool rectilinear_distance_assign(Checked_Number<To, Extended_Number_Policy>& r, The direction of the approximation is specified by \p dir. All computations are performed using variables of type - Checked_Number<To, Extended_Number_Policy>. + <CODE>Checked_Number\<To, Extended_Number_Policy\></CODE>. \note Distances are \e only defined between generators that are points and/or @@ -914,7 +914,7 @@ bool euclidean_distance_assign(Checked_Number<To, Extended_Number_Policy>& r, The direction of the approximation is specified by \p dir. All computations are performed using variables of type - Checked_Number<Temp, Extended_Number_Policy>. + <CODE>Checked_Number\<Temp, Extended_Number_Policy\></CODE>. \note Distances are \e only defined between generators that are points and/or @@ -959,7 +959,7 @@ bool euclidean_distance_assign(Checked_Number<To, Extended_Number_Policy>& r, The direction of the approximation is specified by \p dir. All computations are performed using variables of type - Checked_Number<To, Extended_Number_Policy>. + <CODE>Checked_Number\<To, Extended_Number_Policy\></CODE>. \note Distances are \e only defined between generators that are points and/or @@ -980,7 +980,7 @@ bool l_infinity_distance_assign(Checked_Number<To, Extended_Number_Policy>& r, The direction of the approximation is specified by \p dir. All computations are performed using variables of type - Checked_Number<Temp, Extended_Number_Policy>. + <CODE>Checked_Number\<Temp, Extended_Number_Policy\></CODE>. \note Distances are \e only defined between generators that are points and/or

1 0

[GIT] ppl/ppl(master): Unwanted recursion removed.
by Roberto Bagnara 17 Aug '12

17 Aug '12

Module: ppl/ppl Branch: master Commit: 3307c8da8a4a3d8b98e6f8561c90e45a84b3098a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3307c8da8a4a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Aug 17 14:03:52 2012 +0200 Unwanted recursion removed. Detected by ECLAIR service funrecsn. --- src/CO_Tree.cc | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 1f57df3..cbc1d50 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -536,17 +536,16 @@ PPL::CO_Tree::erase(tree_iterator itr) { } void -PPL::CO_Tree::init(dimension_type reserved_size1) { - if (reserved_size1 == 0) { - indexes = NULL; - data = NULL; - size_ = 0; - reserved_size = 0; - max_depth = 0; - } - else { +PPL::CO_Tree::init(dimension_type n) { + indexes = NULL; + data = NULL; + size_ = 0; + reserved_size = 0; + max_depth = 0; + + if (n > 0) { init(0); - const dimension_type new_max_depth = integer_log2(reserved_size1) + 1; + const dimension_type new_max_depth = integer_log2(n) + 1; const dimension_type new_reserved_size = (static_cast<dimension_type>(1) << new_max_depth) - 1; // If this throws, *this will be the empty tree.

1 0

[GIT] ppl/ppl(master): Fixed several minor documentation issues.
by Enea Zaffanella 16 Aug '12

16 Aug '12

Module: ppl/ppl Branch: master Commit: 2a9d181747120b92aa84e5fd3ab0aafbfbaff34e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2a9d18174712… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 16 17:29:09 2012 +0200 Fixed several minor documentation issues. --- src/BD_Shape.defs.hh | 12 ++++++------ src/Box.defs.hh | 12 ++++++------ src/Concrete_Expression.defs.hh | 6 +++--- src/Concrete_Expression.types.hh | 16 ++++++++-------- src/Determinate.defs.hh | 2 +- src/Floating_Point_Expression.defs.hh | 3 +-- src/Handler.defs.hh | 5 +++-- src/Octagonal_Shape.defs.hh | 12 ++++++------ src/Partially_Reduced_Product.defs.hh | 18 +++++++++--------- src/Pointset_Powerset.defs.hh | 9 ++++----- src/Result.defs.hh | 4 ++-- src/Rounding_Dir.defs.hh | 2 +- src/WRD_coefficient_types.defs.hh | 4 ++-- src/globals.types.hh | 10 +++++----- src/termination.defs.hh | 28 ++++++++++++++-------------- 15 files changed, 71 insertions(+), 72 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2a9d1817…

1 0

[GIT] ppl/ppl(master): Use PPL_U when macro parameters are used as template type arguments.
by Enea Zaffanella 16 Aug '12

16 Aug '12

Module: ppl/ppl Branch: master Commit: f6fd3a314e3a8cad086dbdbad57dce60a1d472c9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f6fd3a314e3a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 16 11:46:29 2012 +0200 Use PPL_U when macro parameters are used as template type arguments. --- src/Expression_Adapter.defs.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Expression_Adapter.defs.hh b/src/Expression_Adapter.defs.hh index 32fc2e5..beb0629 100644 --- a/src/Expression_Adapter.defs.hh +++ b/src/Expression_Adapter.defs.hh @@ -189,10 +189,10 @@ namespace Parma_Polyhedra_Library { #define PPL_DECLARE_EXPR_ADAPTER_MEMBER_SPEC(Class) \ template <> \ -Expression_Adapter<Class>::obj_expr_type const& \ -Expression_Adapter<Class>::obj_expr() const; \ +Expression_Adapter<PPL_U(Class)>::obj_expr_type const& \ +Expression_Adapter<PPL_U(Class)>::obj_expr() const; \ template <> \ -bool Expression_Adapter<Class>::hiding_last() const; +bool Expression_Adapter<PPL_U(Class)>::hiding_last() const; } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(master): Avoid outer-scope name hiding.
by Enea Zaffanella 16 Aug '12

16 Aug '12

Module: ppl/ppl Branch: master Commit: 5d14a674e3ee1b3568dcb62ca514a3d94a2c1881 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5d14a674e3ee… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 16 11:29:45 2012 +0200 Avoid outer-scope name hiding. Detected by ECLAIR service declhidn. --- src/Grid_nonpublic.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Grid_nonpublic.cc b/src/Grid_nonpublic.cc index 99ba2b1..9883856 100644 --- a/src/Grid_nonpublic.cc +++ b/src/Grid_nonpublic.cc @@ -423,8 +423,8 @@ PPL::Grid::max_min(const Linear_Expression& expr, included = true; if (point != 0) { - Linear_Expression expr(gen.expression()); - *point = Generator::point(expr, gen.divisor()); + Linear_Expression g_expr(gen.expression()); + *point = Generator::point(g_expr, gen.divisor()); } return true; }

1 0

[GIT] ppl/ppl(master): Avoid outer-scope name hiding.
by Enea Zaffanella 16 Aug '12

16 Aug '12

Module: ppl/ppl Branch: master Commit: 2d2a72e2c4acc93b60eed10a89c103e3ab0d5e45 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d2a72e2c4ac… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 16 11:25:04 2012 +0200 Avoid outer-scope name hiding. Detected by ECLAIR service declhidn. --- src/Linear_Expression_Impl.templates.hh | 6 ++-- src/termination.cc | 32 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Linear_Expression_Impl.templates.hh b/src/Linear_Expression_Impl.templates.hh index 405cf65..9cb2940 100644 --- a/src/Linear_Expression_Impl.templates.hh +++ b/src/Linear_Expression_Impl.templates.hh @@ -618,9 +618,9 @@ Linear_Expression_Impl<Row>::sign_normalize() { for ( ; i != i_end; ++i) neg_assign(*i); // Negate the first coefficient, too. - typename Row::iterator i = row.begin(); - if (i != row.end() && i.index() == 0) - neg_assign(*i); + typename Row::iterator first = row.begin(); + if (first != row.end() && first.index() == 0) + neg_assign(*first); } PPL_ASSERT(OK()); } diff --git a/src/termination.cc b/src/termination.cc index e0bc1a3..5c37d78 100644 --- a/src/termination.cc +++ b/src/termination.cc @@ -389,20 +389,20 @@ fill_constraint_system_PR(const Constraint_System& cs_before, Variable u3_i(row_index); const Constraint::Expression& e_i = i->expression(); for (Constraint::Expression::const_iterator - i = e_i.lower_bound(Variable(n)), - i_end = e_i.end(); i != i_end; ++i) { - Coefficient_traits::const_reference A_ij_C = *i; - const Variable v = i.variable(); + j = e_i.lower_bound(Variable(n)), + j_end = e_i.end(); j != j_end; ++j) { + Coefficient_traits::const_reference A_ij_C = *j; + const Variable v = j.variable(); // - u3 A_C, in the context of the j-th constraint. sub_mul_assign(les_eq[v.id() - n], A_ij_C, u3_i); // u3 A_C, in the context of the (j+n)-th constraint. add_mul_assign(les_eq[v.id()], A_ij_C, u3_i); } - for (Constraint::Expression::const_iterator i = e_i.begin(), - i_end = e_i.lower_bound(Variable(n)); i != i_end; ++i) { - Coefficient_traits::const_reference Ap_ij_C = *i; + for (Constraint::Expression::const_iterator j = e_i.begin(), + j_end = e_i.lower_bound(Variable(n)); j != j_end; ++j) { + Coefficient_traits::const_reference Ap_ij_C = *j; // u3 Ap_C, in the context of the (j+n)-th constraint. - add_mul_assign(les_eq[i.variable().id() + n], Ap_ij_C, u3_i); + add_mul_assign(les_eq[j.variable().id() + n], Ap_ij_C, u3_i); } Coefficient_traits::const_reference b_C = e_i.inhomogeneous_term(); if (b_C != 0) @@ -437,20 +437,20 @@ fill_constraint_system_PR_original(const Constraint_System& cs, const Constraint::Expression& e_i = i->expression(); const Variable lambda1_i(row_index); const Variable lambda2_i(m + row_index); - for (Constraint::Expression::const_iterator i = e_i.begin(), - i_end = e_i.lower_bound(Variable(n)); i != i_end; ++i) { - Coefficient_traits::const_reference Ap_ij = *i; - const Variable v = i.variable(); + for (Constraint::Expression::const_iterator j = e_i.begin(), + j_end = e_i.lower_bound(Variable(n)); j != j_end; ++j) { + Coefficient_traits::const_reference Ap_ij = *j; + const Variable v = j.variable(); // lambda_1 A' add_mul_assign(les_eq[v.id()], Ap_ij, lambda1_i); // lambda_2 A' add_mul_assign(les_eq[v.id()+n+n], Ap_ij, lambda2_i); } for (Constraint::Expression::const_iterator - i = e_i.lower_bound(Variable(n)), - i_end = e_i.end(); i != i_end; ++i) { - Coefficient_traits::const_reference A_ij = *i; - const Variable v = i.variable(); + j = e_i.lower_bound(Variable(n)), + j_end = e_i.end(); j != j_end; ++j) { + Coefficient_traits::const_reference A_ij = *j; + const Variable v = j.variable(); // (lambda_1 - lambda_2) A add_mul_assign(les_eq[v.id()], A_ij, lambda1_i); sub_mul_assign(les_eq[v.id()], A_ij, lambda2_i);

1 0

[GIT] ppl/ppl(master): Indentation fixed.
by Roberto Bagnara 16 Aug '12

16 Aug '12

Module: ppl/ppl Branch: master Commit: 359a800b113d5b09b165e87b43b37ad5636cde57 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=359a800b113d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Aug 16 14:28:20 2012 +0200 Indentation fixed. Detected by ECLAIR service indntion. --- src/DB_Row.defs.hh | 4 ++-- src/Division_Floating_Point_Expression.defs.hh | 1 - src/Division_Floating_Point_Expression.inlines.hh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/DB_Row.defs.hh b/src/DB_Row.defs.hh index d5002a3..50f46d3 100644 --- a/src/DB_Row.defs.hh +++ b/src/DB_Row.defs.hh @@ -448,9 +448,9 @@ private: //! The vector of coefficients. T vec_[ #if PPL_CXX_SUPPORTS_ZERO_LENGTH_ARRAYS - 0 + 0 #else - 1 + 1 #endif ]; diff --git a/src/Division_Floating_Point_Expression.defs.hh b/src/Division_Floating_Point_Expression.defs.hh index 623b9e6..d41f0d8 100644 --- a/src/Division_Floating_Point_Expression.defs.hh +++ b/src/Division_Floating_Point_Expression.defs.hh @@ -227,7 +227,6 @@ private: operator=(const Division_Floating_Point_Expression<FP_Interval_Type, FP_Format>& e); - }; // class Division_Floating_Point_Expression } // namespace Parma_Polyhedra_Library diff --git a/src/Division_Floating_Point_Expression.inlines.hh b/src/Division_Floating_Point_Expression.inlines.hh index 7f6de8d..25b24be 100644 --- a/src/Division_Floating_Point_Expression.inlines.hh +++ b/src/Division_Floating_Point_Expression.inlines.hh @@ -37,7 +37,7 @@ Division_Floating_Point_Expression<FP_Interval_Type, FP_Format> : first_operand(num), second_operand(den) { assert(num != 0); assert(den != 0); - } +} template <typename FP_Interval_Type, typename FP_Format> inline

1 0

[GIT] ppl/ppl(master): Avoid implicit floating-integral conversions.
by Roberto Bagnara 16 Aug '12

16 Aug '12

Module: ppl/ppl Branch: master Commit: 38e903cb004877d6c3de366568529b171f154ee5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=38e903cb0048… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Aug 16 12:02:41 2012 +0200 Avoid implicit floating-integral conversions. Detected by ECLAIR service utypflag. --- 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 30c9088..8f537f5 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -1009,11 +1009,11 @@ assign_mpq_numeric_float(mpq_class& to, const long double from) { int exp; long double n = std::frexp(from, &exp); bool neg = false; - if (n < 0) { + if (n < 0.0L) { neg = true; n = -n; } - const long double mult = static_cast<long double>(ULONG_MAX) + 1; + const long double mult = static_cast<long double>(ULONG_MAX) + 1.0L; const unsigned int bits = sizeof(unsigned long) * CHAR_BIT; while (true) { n *= mult;

1 0

[GIT] ppl/ppl(master): Do not let constant unsigned integer expressions wrap-around.
by Roberto Bagnara 16 Aug '12

16 Aug '12

Module: ppl/ppl Branch: master Commit: 4cc7becbaff582fe8afaec5eeff00c16662e4092 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4cc7becbaff5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Aug 16 11:59:10 2012 +0200 Do not let constant unsigned integer expressions wrap-around. Detected by ECLAIR service cnstwrap. --- src/C_Integer.hh | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/C_Integer.hh b/src/C_Integer.hh index 4777e0a..8b9a33d 100644 --- a/src/C_Integer.hh +++ b/src/C_Integer.hh @@ -89,8 +89,8 @@ struct C_Integer<signed char> : public True { typedef void smaller_signed_type; typedef void smaller_unsigned_type; typedef unsigned char other_type; - static const signed char min = SCHAR_MIN; - static const signed char max = SCHAR_MAX; + static const signed char min = static_cast<signed char>(SCHAR_MIN); + static const signed char max = static_cast<signed char>(SCHAR_MAX); }; template <> @@ -100,8 +100,8 @@ struct C_Integer<signed short> : public True { typedef signed char smaller_signed_type; typedef unsigned char smaller_unsigned_type; typedef unsigned short other_type; - static const signed short min = SHRT_MIN; - static const signed short max = SHRT_MAX; + static const signed short min = static_cast<signed short>(SHRT_MIN); + static const signed short max = static_cast<signed short>(SHRT_MAX); }; template <> @@ -144,8 +144,8 @@ struct C_Integer<unsigned char> : public True { typedef void smaller_signed_type; typedef void smaller_unsigned_type; typedef signed char other_type; - static const unsigned char min = 0U; - static const unsigned char max = static_cast<unsigned char>(~0U); + static const unsigned char min = static_cast<unsigned char>(0U); + static const unsigned char max = static_cast<unsigned char>(UCHAR_MAX); }; template <> @@ -155,8 +155,8 @@ struct C_Integer<unsigned short> : public True { typedef signed char smaller_signed_type; typedef unsigned char smaller_unsigned_type; typedef signed short other_type; - static const unsigned short min = 0U; - static const unsigned short max = static_cast<unsigned short>(~0U); + static const unsigned short min = static_cast<unsigned short>(0U); + static const unsigned short max = static_cast<unsigned short>(USHRT_MAX); }; template <> @@ -167,7 +167,7 @@ struct C_Integer<unsigned int> : public True { typedef unsigned short smaller_unsigned_type; typedef signed int other_type; static const unsigned int min = 0U; - static const unsigned int max = ~0U; + static const unsigned int max = UINT_MAX; }; template <> @@ -178,7 +178,7 @@ struct C_Integer<unsigned long> : public True { typedef unsigned int smaller_unsigned_type; typedef signed long other_type; static const unsigned long min = 0UL; - static const unsigned long max = ~0UL; + static const unsigned long max = ULONG_MAX; }; template <> @@ -189,7 +189,7 @@ struct C_Integer<unsigned long long> : public True { typedef unsigned long smaller_unsigned_type; typedef signed long long other_type; static const unsigned long long min = 0ULL; - static const unsigned long long max = ~0ULL; + static const unsigned long long max = ULLONG_MAX; }; } // namespace Parma_Polyhedra_Library

1 0