February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Missing default added.
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 81c390271c8f47449334cf77571eb991c40c47d8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81c390271c8f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 22:59:23 2012 +0100 Missing default added. --- src/Interval.defs.hh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/Interval.defs.hh b/src/Interval.defs.hh index 843d17e..7be0400 100644 --- a/src/Interval.defs.hh +++ b/src/Interval.defs.hh @@ -383,6 +383,10 @@ public: set_unbounded(UPPER, upper(), info()); r = I_UNIVERSE | I_EXACT; break; + default: + PPL_UNREACHABLE; + r = I_EMPTY; + break; } PPL_ASSERT(OK()); return r;

1 0

[GIT] ppl/ppl(master): Renamed some variables so that declarations in an outer scope are not hidden .
by Patricia Hill 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 8579a7da71f7d73e4c6835434aa00bae29865e2d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8579a7da71f7… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Feb 20 21:56:39 2012 +0000 Renamed some variables so that declarations in an outer scope are not hidden. Detected by ECLAIR service declhidn. --- src/Boundary.defs.hh | 144 +++++++++++++++++++++--------------------- src/Grid.templates.hh | 8 +- src/PIP_Problem.cc | 6 +- src/checked_float.inlines.hh | 6 +- 4 files changed, 82 insertions(+), 82 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=8579a7da…

1 0

[GIT] ppl/ppl(master): Revert " Renamed some variables so that declarations in an outer scope are not hidden ."
by Patricia Hill 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: e9fee53d2e10691f6a6723c0c28631e573e84ffc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9fee53d2e10… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Feb 20 21:47:45 2012 +0000 Revert "Renamed some variables so that declarations in an outer scope are not hidden." This reverts commit 97cc40667310524111a674be5ad3e8e9e4ec8c90. --- src/Grid.templates.hh | 8 ++++---- src/PIP_Problem.cc | 6 +++--- src/checked_float.inlines.hh | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh index 03d01ae..94d756f 100644 --- a/src/Grid.templates.hh +++ b/src/Grid.templates.hh @@ -270,7 +270,7 @@ Grid::reduce_reduced(M& sys, const dimension_type pivot_index, const dimension_type start, const dimension_type end, - const Dimension_Kinds& sys_dim_kinds, + const Dimension_Kinds& dim_kinds, const bool generators) { R& pivot = sys[pivot_index]; @@ -281,7 +281,7 @@ Grid::reduce_reduced(M& sys, PPL_DIRTY_TEMP_COEFFICIENT(pivot_dim_half); pivot_dim_half = (pivot_dim + 1) / 2; - Dimension_Kind row_kind = sys_dim_kinds[dim]; + Dimension_Kind row_kind = dim_kinds[dim]; Dimension_Kind line_or_equality, virtual_kind; int jump; if (generators) { @@ -301,13 +301,13 @@ Grid::reduce_reduced(M& sys, row_index-- > 0; kinds_index += jump) { // Move over any virtual rows. - while (sys_dim_kinds[kinds_index] == virtual_kind) + while (dim_kinds[kinds_index] == virtual_kind) kinds_index += jump; // row_kind CONGRUENCE is included as PARAMETER if (row_kind == line_or_equality || (row_kind == PARAMETER - && sys_dim_kinds[kinds_index] == PARAMETER)) { + && dim_kinds[kinds_index] == PARAMETER)) { R& row = sys[row_index]; const Coefficient& row_dim = row[dim]; diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index ae9ccb3..bfe1c2c 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -177,10 +177,10 @@ PPL::PIP_Problem::solve() const { for (Variables_Set::const_iterator pi = param_begin; pi != param_end; ++pi, ++i) { if (*pi < c_space_dim) { - Coefficient_traits::const_reference coeff_pi + Coefficient_traits::const_reference x = c.coefficient(Variable(*pi)); - if (coeff_pi != 0) - itr = row.insert(itr, i, coeff_pi); + if (x != 0) + itr = row.insert(itr, i, x); } else break; } diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 755e96a..6c2b97a 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -154,10 +154,10 @@ classify_float(const T v, bool nan, bool inf, bool sign) { return V_NAN; if (inf) { if (Policy::has_infinity) { - int sign_inf = f.u.binary.inf_sign(); - if (sign_inf < 0) + int sign = f.u.binary.inf_sign(); + if (sign < 0) return V_EQ_MINUS_INFINITY; - if (sign_inf > 0) + if (sign > 0) return V_EQ_PLUS_INFINITY; } else

1 0

[GIT] ppl/ppl(master): Global-replace mistake fixed.
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 37e82b178604094c5862863e651583096b31b332 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37e82b178604… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 22:53:39 2012 +0100 Global-replace mistake fixed. --- tests/Watchdog/watchdog1.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Watchdog/watchdog1.cc b/tests/Watchdog/watchdog1.cc index 48444d0..33ad705 100644 --- a/tests/Watchdog/watchdog1.cc +++ b/tests/Watchdog/watchdog1.cc @@ -38,7 +38,7 @@ test01() { try { bool ok; { - Watchdog::Watchdog w(csecs, do_interrupt); + Watchdog w(csecs, do_interrupt); nout << ((float) csecs)/100.0 << " seconds watchdog" << endl; nout << "starting iteration... " << std::flush;

1 0

[GIT] ppl/ppl(master): The Parma Watchdog Library has been merged into the Parma Polyhedra Library .
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: ed39879f090cbad40861608fa63488c071c2f99a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ed39879f090c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 22:49:56 2012 +0100 The Parma Watchdog Library has been merged into the Parma Polyhedra Library. --- Makefile.am | 4 +- NEWS | 3 + Watchdog/.gitignore | 3 - Watchdog/BUGS | 2 - Watchdog/COPYING | 674 -- Watchdog/CREDITS | 12 - Watchdog/ChangeLog | 758 -- Watchdog/ChangeLog_2001-2008 | 2162 ----- Watchdog/INSTALL | 365 - Watchdog/Makefile.am | 63 - Watchdog/NEWS | 97 - Watchdog/README | 153 - Watchdog/compile | 310 - Watchdog/config.guess | 1523 --- Watchdog/config.rpath | 666 -- Watchdog/config.sub | 1771 ---- Watchdog/configure.ac | 434 - Watchdog/depcomp | 688 -- Watchdog/doc/.gitignore | 13 - Watchdog/doc/Makefile.am | 300 - Watchdog/doc/README.doc | 141 - Watchdog/doc/devref.doxyconf-html.in | 287 - Watchdog/doc/devref.doxyconf-latex.in | 287 - Watchdog/doc/devref.tex | 121 - Watchdog/doc/fdl.dox | 407 - Watchdog/doc/fdl.tex | 454 - Watchdog/doc/fdl.txt | 397 - Watchdog/doc/gpl.dox | 686 -- Watchdog/doc/gpl.tex | 728 -- Watchdog/doc/gpl.txt | 674 -- Watchdog/doc/pwl.sty | 179 - Watchdog/doc/user.doxyconf-html.in | 255 - Watchdog/doc/user.doxyconf-latex.in | 255 - Watchdog/doc/user.tex | 121 - Watchdog/install-sh | 527 -- Watchdog/ltmain.sh | 9655 -------------------- Watchdog/m4/Makefile.am | 38 - Watchdog/m4/lib-ld.m4 | 110 - Watchdog/m4/lib-link.m4 | 764 -- Watchdog/m4/libtool.m4 | 7982 ---------------- Watchdog/m4/ltoptions.m4 | 384 - Watchdog/m4/ltsugar.m4 | 123 - Watchdog/m4/ltversion.m4 | 23 - Watchdog/m4/lt~obsolete.m4 | 98 - Watchdog/missing | 331 - Watchdog/mkinstalldirs | 162 - Watchdog/pwl-config.sed | 24 - Watchdog/src/.gitignore | 2 - Watchdog/src/Makefile.am | 158 - Watchdog/src/Watchdog.types.hh | 22 - Watchdog/src/pwl_header.hh | 53 - Watchdog/tests/.gitignore | 1 - Watchdog/tests/pwl_test.cc | 194 - Watchdog/tests/pwl_test.hh | 207 - Watchdog/tests/valgrind_suppressions | 18 - Watchdog/utils/.gitignore | 1 - Watchdog/utils/Makefile.am | 46 - Watchdog/utils/build_header.in | 103 - configure.ac | 35 +- doc/devref.doxyconf-html.in | 31 + doc/devref.doxyconf-latex.in | 31 + interfaces/C/Makefile.am | 9 - interfaces/C/tests/Makefile.am | 46 +- interfaces/C/tests/watchdog1.c | 4 +- interfaces/Java/jni/Makefile.am | 9 - interfaces/Java/tests/Makefile.am | 6 - interfaces/OCaml/Makefile.am | 11 +- interfaces/OCaml/tests/Makefile.am | 22 +- interfaces/Prolog/Ciao/Makefile.am | 15 - interfaces/Prolog/GNU/Makefile.am | 21 +- interfaces/Prolog/SICStus/Makefile.am | 30 +- interfaces/Prolog/SWI/Makefile.am | 21 +- interfaces/Prolog/XSB/Makefile.am | 18 +- interfaces/Prolog/YAP/Makefile.am | 15 - ppl-config.sed | 1 + {Watchdog/src => src}/Doubly_Linked_Object.defs.hh | 14 +- .../src => src}/Doubly_Linked_Object.inlines.hh | 24 +- .../src => src}/Doubly_Linked_Object.types.hh | 18 +- {Watchdog/src => src}/EList.defs.hh | 16 +- {Watchdog/src => src}/EList.inlines.hh | 24 +- {Watchdog/src => src}/EList.types.hh | 18 +- {Watchdog/src => src}/EList_Iterator.defs.hh | 26 +- {Watchdog/src => src}/EList_Iterator.inlines.hh | 24 +- {Watchdog/src => src}/EList_Iterator.types.hh | 18 +- {Watchdog/src => src}/Handler.defs.hh | 20 +- {Watchdog/src => src}/Handler.inlines.hh | 24 +- {Watchdog/src => src}/Handler.types.hh | 18 +- src/Init.cc | 12 + src/Makefile.am | 36 +- {Watchdog/src => src}/Pending_Element.defs.hh | 15 +- {Watchdog/src => src}/Pending_Element.inlines.hh | 24 +- {Watchdog/src => src}/Pending_Element.types.hh | 18 +- {Watchdog/src => src}/Pending_List.defs.hh | 14 +- {Watchdog/src => src}/Pending_List.inlines.hh | 24 +- {Watchdog/src => src}/Pending_List.templates.hh | 24 +- {Watchdog/src => src}/Pending_List.types.hh | 18 +- {Watchdog/src => src}/Threshold_Watcher.cc | 8 +- {Watchdog/src => src}/Threshold_Watcher.defs.hh | 30 +- {Watchdog/src => src}/Threshold_Watcher.inlines.hh | 23 +- .../src => src}/Threshold_Watcher.templates.hh | 18 +- {Watchdog/src => src}/Threshold_Watcher.types.hh | 10 +- {Watchdog/src => src}/Time.cc | 12 +- {Watchdog/src => src}/Time.defs.hh | 26 +- {Watchdog/src => src}/Time.inlines.hh | 24 +- {Watchdog/src => src}/Time.types.hh | 18 +- {Watchdog/src => src}/Watchdog.cc | 69 +- {Watchdog/src => src}/Watchdog.defs.hh | 80 +- {Watchdog/src => src}/Watchdog.inlines.hh | 51 +- .../src/Time.types.hh => src/Watchdog.types.hh | 12 +- src/ppl_header.hh | 4 + tests/Ask_Tell/Makefile.am | 2 - tests/Box/Makefile.am | 22 +- tests/CO_Tree/Makefile.am | 1 - tests/Concrete_Expression/Makefile.am | 3 - tests/MIP_Problem/Makefile.am | 21 +- tests/PIP_Problem/Makefile.am | 4 - tests/Polyhedron/Makefile.am | 66 +- tests/Polyhedron/watchdog1.cc | 7 +- tests/Polyhedron/weightwatch1.cc | 3 +- tests/Sparse_Matrix/Makefile.am | 1 - {Watchdog/tests => tests/Watchdog}/Makefile.am | 36 +- {Watchdog/tests => tests/Watchdog}/watchdog1.cc | 16 +- 122 files changed, 642 insertions(+), 36698 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=ed39879f…

1 0

[GIT] ppl/ppl(master): Renamed some variables so that declarations in an outer scope are not hidden .
by Patricia Hill 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 97cc40667310524111a674be5ad3e8e9e4ec8c90 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97cc40667310… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Feb 20 20:58:18 2012 +0000 Renamed some variables so that declarations in an outer scope are not hidden. --- src/Grid.templates.hh | 8 ++++---- src/PIP_Problem.cc | 6 +++--- src/checked_float.inlines.hh | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh index 94d756f..03d01ae 100644 --- a/src/Grid.templates.hh +++ b/src/Grid.templates.hh @@ -270,7 +270,7 @@ Grid::reduce_reduced(M& sys, const dimension_type pivot_index, const dimension_type start, const dimension_type end, - const Dimension_Kinds& dim_kinds, + const Dimension_Kinds& sys_dim_kinds, const bool generators) { R& pivot = sys[pivot_index]; @@ -281,7 +281,7 @@ Grid::reduce_reduced(M& sys, PPL_DIRTY_TEMP_COEFFICIENT(pivot_dim_half); pivot_dim_half = (pivot_dim + 1) / 2; - Dimension_Kind row_kind = dim_kinds[dim]; + Dimension_Kind row_kind = sys_dim_kinds[dim]; Dimension_Kind line_or_equality, virtual_kind; int jump; if (generators) { @@ -301,13 +301,13 @@ Grid::reduce_reduced(M& sys, row_index-- > 0; kinds_index += jump) { // Move over any virtual rows. - while (dim_kinds[kinds_index] == virtual_kind) + while (sys_dim_kinds[kinds_index] == virtual_kind) kinds_index += jump; // row_kind CONGRUENCE is included as PARAMETER if (row_kind == line_or_equality || (row_kind == PARAMETER - && dim_kinds[kinds_index] == PARAMETER)) { + && sys_dim_kinds[kinds_index] == PARAMETER)) { R& row = sys[row_index]; const Coefficient& row_dim = row[dim]; diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index bfe1c2c..ae9ccb3 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -177,10 +177,10 @@ PPL::PIP_Problem::solve() const { for (Variables_Set::const_iterator pi = param_begin; pi != param_end; ++pi, ++i) { if (*pi < c_space_dim) { - Coefficient_traits::const_reference x + Coefficient_traits::const_reference coeff_pi = c.coefficient(Variable(*pi)); - if (x != 0) - itr = row.insert(itr, i, x); + if (coeff_pi != 0) + itr = row.insert(itr, i, coeff_pi); } else break; } diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 6c2b97a..755e96a 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -154,10 +154,10 @@ classify_float(const T v, bool nan, bool inf, bool sign) { return V_NAN; if (inf) { if (Policy::has_infinity) { - int sign = f.u.binary.inf_sign(); - if (sign < 0) + int sign_inf = f.u.binary.inf_sign(); + if (sign_inf < 0) return V_EQ_MINUS_INFINITY; - if (sign > 0) + if (sign_inf > 0) return V_EQ_PLUS_INFINITY; } else

1 0

[GIT] ppl/ppl(master): Spurious line removed.
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 3ded8bb10d824721a1bb6ed083de18d2350be36f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3ded8bb10d82… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 18:57:50 2012 +0100 Spurious line removed. --- devtools/good_ids | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/devtools/good_ids b/devtools/good_ids index 5fdc170..c16db34 100644 --- a/devtools/good_ids +++ b/devtools/good_ids @@ -14,7 +14,6 @@ PPL_PACKAGE_BUGREPORT RLIMIT_AS RLIMIT_CPU RUSAGE_SELF -Rule B.PROGVCBL: SA_ONESHOT SA_RESETHAND SCHAR_MAX

1 0

[GIT] ppl/ppl(master): Added/fixed some copyright notices.
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 2603585b9999c9288e1168cdc179014e7f865b27 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2603585b9999… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 18:57:17 2012 +0100 Added/fixed some copyright notices. --- README.alpha | 12 ++++++++++++ README.arm | 12 ++++++++++++ README.solaris | 12 ++++++++++++ devtools/update_ChangeLog | 12 ++++++++++++ interfaces/Java/README.java | 20 ++++++++++++++++---- interfaces/OCaml/README.ocaml | 11 +++++++++++ interfaces/Prolog/Ciao/README.ciao | 12 ++++++++++++ interfaces/Prolog/GNU/README.gprolog | 12 ++++++++++++ interfaces/Prolog/SWI/README.swiprolog | 12 ++++++++++++ interfaces/Prolog/YAP/README.yap | 12 ++++++++++++ tests/MIP_Problem/mipproblem4.cc | 1 + 11 files changed, 124 insertions(+), 4 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2603585b…

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: b4dac3bae9765441ee8be3b45a8fb495fbcdc56d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b4dac3bae976… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:55:33 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Float.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index fb2b78d..6d851db 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -470,7 +470,7 @@ is_less_precise_than(Floating_Point_Format f1, Floating_Point_Format f2) { inline unsigned int msb_position(unsigned long long v) { PPL_ASSERT(v != 0); - return __builtin_clzll(v) ^ (sizeof(v)*8 - 1); + return static_cast<unsigned>(__builtin_clzll(v)) ^ (sizeof(v)*8 - 1); } #else unsigned int

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: c64257c541e084d8f6adce267f894384fa39d45b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c64257c541e0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:29:54 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Linear_Row.cc | 10 +++++----- src/Linear_Row.defs.hh | 2 +- src/Linear_Row.inlines.hh | 39 ++++++++++++++++++++------------------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/Linear_Row.cc b/src/Linear_Row.cc index 9b0f52d..5a5de51 100644 --- a/src/Linear_Row.cc +++ b/src/Linear_Row.cc @@ -152,14 +152,14 @@ const char* bit_names[] = {rpi_valid, is_rpi, nnc_valid, is_nnc}; void PPL::Linear_Row::Flags::ascii_dump(std::ostream& s) const { - s << (test_bits(1 << Flags::rpi_validity_bit) ? '+' : '-') + s << (test_bits(1U << Flags::rpi_validity_bit) ? '+' : '-') << rpi_valid << ' ' - << (test_bits(1 << Flags::rpi_bit) ? '+' : '-') + << (test_bits(1U << Flags::rpi_bit) ? '+' : '-') << is_rpi << ' ' << ' ' - << (test_bits(1 << Flags::nnc_validity_bit) ? '+' : '-') + << (test_bits(1U << Flags::nnc_validity_bit) ? '+' : '-') << nnc_valid << ' ' - << (test_bits(1 << Flags::nnc_bit) ? '+' : '-') + << (test_bits(1U << Flags::nnc_bit) ? '+' : '-') << is_nnc; } @@ -176,7 +176,7 @@ PPL::Linear_Row::Flags::ascii_load(std::istream& s) { if (!(s >> str)) return false; if (str[0] == '+') - set_bits(1 << (Dense_Row::Flags::first_free_bit + bit)); + set_bits(1U << (Dense_Row::Flags::first_free_bit + bit)); else if (str[0] != '-') return false; if (str.compare(1, strlen(bit_names[bit]), bit_names[bit]) != 0) diff --git a/src/Linear_Row.defs.hh b/src/Linear_Row.defs.hh index 65c12db..b42e61f 100644 --- a/src/Linear_Row.defs.hh +++ b/src/Linear_Row.defs.hh @@ -187,7 +187,7 @@ public: private: //! Builds the type from a bit-mask. explicit Flags(base_type mask); - + //! Constructor from a Dense_Row::Flags object. explicit Flags(Dense_Row::Flags flags); diff --git a/src/Linear_Row.inlines.hh b/src/Linear_Row.inlines.hh index e3037f6..571a7e3 100644 --- a/src/Linear_Row.inlines.hh +++ b/src/Linear_Row.inlines.hh @@ -43,75 +43,76 @@ Linear_Row::Flags::Flags(Dense_Row::Flags f) inline Linear_Row::Flags::Flags(const Topology t) - : Dense_Row::Flags(t << nnc_bit) { + : Dense_Row::Flags(static_cast<unsigned>(t) << nnc_bit) { #ifndef NDEBUG - set_bits(1 << nnc_validity_bit); + set_bits(1U << nnc_validity_bit); #endif } inline Linear_Row::Flags::Flags(const Topology t, const Kind k) - : Dense_Row::Flags((k << rpi_bit) | (t << nnc_bit)) { + : Dense_Row::Flags((static_cast<unsigned>(k) << rpi_bit) + | (static_cast<unsigned>(t) << nnc_bit)) { #ifndef NDEBUG - set_bits((1 << rpi_validity_bit) - | (1 << nnc_validity_bit)); + set_bits((1U << rpi_validity_bit) | (1U << nnc_validity_bit)); #endif } inline bool Linear_Row::Flags::is_ray_or_point_or_inequality() const { - PPL_ASSERT(test_bits(1 << rpi_validity_bit)); - return test_bits(RAY_OR_POINT_OR_INEQUALITY << rpi_bit); + PPL_ASSERT(test_bits(1U << rpi_validity_bit)); + return + test_bits(static_cast<unsigned>(RAY_OR_POINT_OR_INEQUALITY) << rpi_bit); } inline void Linear_Row::Flags::set_is_ray_or_point_or_inequality() { #ifndef NDEBUG - set_bits(1 << rpi_validity_bit); + set_bits(1U << rpi_validity_bit); #endif - set_bits(RAY_OR_POINT_OR_INEQUALITY << rpi_bit); + set_bits(static_cast<unsigned>(RAY_OR_POINT_OR_INEQUALITY) << rpi_bit); } inline bool Linear_Row::Flags::is_line_or_equality() const { - PPL_ASSERT(test_bits(1 << rpi_validity_bit)); + PPL_ASSERT(test_bits(1U << rpi_validity_bit)); return !is_ray_or_point_or_inequality(); } inline void Linear_Row::Flags::set_is_line_or_equality() { #ifndef NDEBUG - set_bits(1 << rpi_validity_bit); + set_bits(1U << rpi_validity_bit); #endif - reset_bits(RAY_OR_POINT_OR_INEQUALITY << rpi_bit); + reset_bits(static_cast<unsigned>(RAY_OR_POINT_OR_INEQUALITY) << rpi_bit); } inline bool Linear_Row::Flags::is_not_necessarily_closed() const { - PPL_ASSERT(test_bits(1 << nnc_validity_bit)); - return test_bits(NOT_NECESSARILY_CLOSED << nnc_bit); + PPL_ASSERT(test_bits(1U << nnc_validity_bit)); + return test_bits(static_cast<unsigned>(NOT_NECESSARILY_CLOSED) << nnc_bit); } inline bool Linear_Row::Flags::is_necessarily_closed() const { - PPL_ASSERT(test_bits(1 << nnc_validity_bit)); + PPL_ASSERT(test_bits(1U << nnc_validity_bit)); return !is_not_necessarily_closed(); } inline void Linear_Row::Flags::set_not_necessarily_closed() { #ifndef NDEBUG - set_bits(1 << nnc_validity_bit); + set_bits(1U << nnc_validity_bit); #endif - set_bits(NOT_NECESSARILY_CLOSED << nnc_bit); + set_bits(static_cast<unsigned>(NOT_NECESSARILY_CLOSED) << nnc_bit); } inline void Linear_Row::Flags::set_necessarily_closed() { #ifndef NDEBUG - set_bits(1 << nnc_validity_bit); + set_bits(1U << nnc_validity_bit); #endif - reset_bits(NOT_NECESSARILY_CLOSED << nnc_bit); + reset_bits(static_cast<unsigned>(NOT_NECESSARILY_CLOSED) << nnc_bit); } inline Topology

1 0