December 2014 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Corrected several header inclusions.
by Roberto Bagnara 24 Dec '14

24 Dec '14

Module: ppl/ppl Branch: master Commit: bde8814132c937849986d838c3a0b83e46f5f3d6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bde8814132c9… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Wed Dec 24 12:10:06 2014 +0100 Corrected several header inclusions. Fixes violations of rule UCGP1.F1 detected by ECLAIR. --- demos/ppl_lpsol/dummy.cc | 4 +++- demos/ppl_lpsol/ppl_lpsol.c | 2 +- src/BDS_Status.cc | 2 ++ src/Box_Status.cc | 2 ++ src/Floating_Point_Expression_defs.hh | 2 +- src/Interval_defs.hh | 2 +- src/MIP_Problem.cc | 12 ++++++------ src/NNC_Polyhedron_defs.hh | 2 +- src/OR_Matrix_defs.hh | 2 +- src/Og_Status.cc | 2 ++ 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/demos/ppl_lpsol/dummy.cc b/demos/ppl_lpsol/dummy.cc index 77ed707..9ee2793 100644 --- a/demos/ppl_lpsol/dummy.cc +++ b/demos/ppl_lpsol/dummy.cc @@ -10,4 +10,6 @@ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -// This file intentionally contains only this comment :-) +// This file intentionally contains only the following inclusion. +#include "ppl-config.h" + diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 52d1cce..e5ce611 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -#include <ppl-config.h> +#include "ppl-config.h" #include "ppl_c.h" #include <gmp.h> #include <stdio.h> diff --git a/src/BDS_Status.cc b/src/BDS_Status.cc index 81e979e..0e67012 100644 --- a/src/BDS_Status.cc +++ b/src/BDS_Status.cc @@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ +#include "ppl-config.h" + namespace Parma_Polyhedra_Library { namespace Implementation { diff --git a/src/Box_Status.cc b/src/Box_Status.cc index b12709d..222ee41 100644 --- a/src/Box_Status.cc +++ b/src/Box_Status.cc @@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ +#include "ppl-config.h" + namespace Parma_Polyhedra_Library { namespace Implementation { diff --git a/src/Floating_Point_Expression_defs.hh b/src/Floating_Point_Expression_defs.hh index a69dc87..38d3cbd 100644 --- a/src/Floating_Point_Expression_defs.hh +++ b/src/Floating_Point_Expression_defs.hh @@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Floating_Point_Expression_defs_hh #define PPL_Floating_Point_Expression_defs_hh 1 -#include "globals_defs.hh" #include "Floating_Point_Expression_types.hh" +#include "globals_defs.hh" #include "Linear_Form_types.hh" #include "Box_types.hh" #include <cmath> diff --git a/src/Interval_defs.hh b/src/Interval_defs.hh index 52385d1..376a5f3 100644 --- a/src/Interval_defs.hh +++ b/src/Interval_defs.hh @@ -24,11 +24,11 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Interval_defs_hh #define PPL_Interval_defs_hh 1 +#include "Interval_types.hh" #include "globals_defs.hh" #include "meta_programming.hh" #include "assign_or_swap.hh" #include "intervals_defs.hh" -#include "Interval_types.hh" #include "Interval_Info_defs.hh" #include <iosfwd> diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 1ca83d6..38e97d7 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -34,12 +34,6 @@ site: http://bugseng.com/products/ppl/ . */ #include "Scalar_Products_inlines.hh" #include "math_utilities_defs.hh" -#include <stdexcept> -#include <deque> -#include <vector> -#include <algorithm> -#include <cmath> - // TODO: Remove this when the sparse working cost has been tested enough. #if PPL_USE_SPARSE_MATRIX @@ -58,6 +52,12 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_SIMPLEX_USE_MIP_HEURISTIC 1 #endif +#include <stdexcept> +#include <deque> +#include <vector> +#include <algorithm> +#include <cmath> + #if PPL_NOISY_SIMPLEX #include <iostream> #endif diff --git a/src/NNC_Polyhedron_defs.hh b/src/NNC_Polyhedron_defs.hh index 962d201..1dbfb76 100644 --- a/src/NNC_Polyhedron_defs.hh +++ b/src/NNC_Polyhedron_defs.hh @@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_NNC_Polyhedron_defs_hh #define PPL_NNC_Polyhedron_defs_hh 1 -#include "C_Polyhedron_types.hh" #include "NNC_Polyhedron_types.hh" +#include "C_Polyhedron_types.hh" #include "Polyhedron_defs.hh" #include "Grid_types.hh" diff --git a/src/OR_Matrix_defs.hh b/src/OR_Matrix_defs.hh index 9ee49d3..8a12b3d 100644 --- a/src/OR_Matrix_defs.hh +++ b/src/OR_Matrix_defs.hh @@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_OR_Matrix_defs_hh #define PPL_OR_Matrix_defs_hh 1 -#include "globals_defs.hh" #include "OR_Matrix_types.hh" +#include "globals_defs.hh" #include "DB_Row_defs.hh" #include "Checked_Number_defs.hh" #include <cstddef> diff --git a/src/Og_Status.cc b/src/Og_Status.cc index b5314f6..e79dc05 100644 --- a/src/Og_Status.cc +++ b/src/Og_Status.cc @@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ +#include "ppl-config.h" + namespace Parma_Polyhedra_Library { namespace Implementation {

1 0

[GIT] ppl/ppl(master): Provided virtual method anchor.
by Roberto Bagnara 23 Dec '14

23 Dec '14

Module: ppl/ppl Branch: master Commit: 888f37dcafe2dee1e306b505fcba51709bc4aaf8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=888f37dcafe2… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 23 22:01:32 2014 +0100 Provided virtual method anchor. Fixes a violation of rule UCGP1.L4 detected by ECLAIR. --- src/Handler.cc | 6 ++++++ src/Handler_inlines.hh | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Handler.cc b/src/Handler.cc index 49438fc..275ec62 100644 --- a/src/Handler.cc +++ b/src/Handler.cc @@ -28,3 +28,9 @@ namespace PPL = Parma_Polyhedra_Library; PPL::Implementation::Watchdog::Handler::~Handler() { } + +void +PPL::Implementation::Watchdog::Handler_Function::act() const { + (*f)(); +} + diff --git a/src/Handler_inlines.hh b/src/Handler_inlines.hh index bd11dfe..5d10b90 100644 --- a/src/Handler_inlines.hh +++ b/src/Handler_inlines.hh @@ -49,11 +49,6 @@ Handler_Function::Handler_Function(void (* const function)()) : f(function) { } -inline void -Handler_Function::act() const { - (*f)(); -} - } // namespace Watchdog } // namespace Implementation

1 0

[GIT] ppl/ppl(master): Spurious `inline' qualifier removed.
by Roberto Bagnara 23 Dec '14

23 Dec '14

Module: ppl/ppl Branch: master Commit: f680d732a425fd5efcc58762b0784d1bf92303ba URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f680d732a425… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 23 13:12:22 2014 +0100 Spurious `inline' qualifier removed. --- src/Handler.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/Handler.cc b/src/Handler.cc index f77b7d9..49438fc 100644 --- a/src/Handler.cc +++ b/src/Handler.cc @@ -26,6 +26,5 @@ site: http://bugseng.com/products/ppl/ . */ namespace PPL = Parma_Polyhedra_Library; -inline PPL::Implementation::Watchdog::Handler::~Handler() { }

1 0

[GIT] ppl/ppl(master): Corrected several header inclusions.
by Roberto Bagnara 23 Dec '14

23 Dec '14

Module: ppl/ppl Branch: master Commit: d78536b521e1cf5b4b37fe4b8d22c8bdcffda497 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d78536b521e1… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 23 10:20:36 2014 +0100 Corrected several header inclusions. Fixes violations of rule UCGP1.F1 detected by ECLAIR. --- src/BHRZ03_Certificate_defs.hh | 1 - src/BHRZ03_Certificate_inlines.hh | 2 ++ src/Bit_Matrix_inlines.hh | 10 ++++------ src/Coefficient_defs.hh | 3 ++- src/Determinate_defs.hh | 1 - src/Float_defs.hh | 1 - src/Float_inlines.hh | 3 ++- src/GMP_Integer_types.hh | 2 +- src/Grid_Certificate_defs.hh | 1 - src/Grid_Certificate_inlines.hh | 2 ++ src/H79_Certificate_defs.hh | 1 - src/Interval_Info_defs.hh | 1 - src/Interval_defs.hh | 3 --- src/Linear_Expression_Impl_defs.hh | 2 +- src/Linear_System_templates.hh | 3 +-- src/PIP_Problem_defs.hh | 3 +-- src/Partial_Function_inlines.hh | 2 +- src/Powerset_inlines.hh | 7 +++---- src/Powerset_templates.hh | 5 ++--- src/Ptr_Iterator_inlines.hh | 3 --- src/Swapping_Vector_defs.hh | 2 -- src/Swapping_Vector_inlines.hh | 2 ++ src/Threshold_Watcher_inlines.hh | 6 +++--- src/algorithms.hh | 1 - src/checked_defs.hh | 6 +++--- src/intervals_defs.hh | 3 +-- src/math_utilities_inlines.hh | 2 +- 27 files changed, 32 insertions(+), 46 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d78536b5…

1 0

[GIT] ppl/ppl(master): The interface file shall contain declarations only.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 9f12958e6c82d30c1af400c6e786d8ff60cc6893 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f12958e6c82… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 22:29:58 2014 +0100 The interface file shall contain declarations only. Fixes violations of rule EP1.31 detected by ECLAIR. --- src/BDS_Status.cc | 40 ++++++++++++++++++++++++++++++++++++++++ src/BDS_Status_inlines.hh | 10 +++++----- src/Box_Status.cc | 39 +++++++++++++++++++++++++++++++++++++++ src/Box_Status_inlines.hh | 8 ++++---- src/Makefile.am | 3 +++ src/Og_Status.cc | 39 +++++++++++++++++++++++++++++++++++++++ src/Og_Status_inlines.hh | 8 ++++---- 7 files changed, 134 insertions(+), 13 deletions(-) diff --git a/src/BDS_Status.cc b/src/BDS_Status.cc new file mode 100644 index 0000000..81e979e --- /dev/null +++ b/src/BDS_Status.cc @@ -0,0 +1,40 @@ +/* BD_Shape<T>::Status class implementation: data objects. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +namespace BD_Shapes { + +// These are the keywords that indicate the individual assertions. +const char* zero_dim_univ = "ZE"; +const char* empty = "EM"; +const char* sp_closed = "SPC"; +const char* sp_reduced = "SPR"; + +} // namespace BD_Shapes + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library diff --git a/src/BDS_Status_inlines.hh b/src/BDS_Status_inlines.hh index 8fade89..7a17cee 100644 --- a/src/BDS_Status_inlines.hh +++ b/src/BDS_Status_inlines.hh @@ -189,10 +189,10 @@ namespace Implementation { namespace BD_Shapes { // These are the keywords that indicate the individual assertions. -const std::string zero_dim_univ = "ZE"; -const std::string empty = "EM"; -const std::string sp_closed = "SPC"; -const std::string sp_reduced = "SPR"; +extern const char* zero_dim_univ; +extern const char* empty; +extern const char* sp_closed; +extern const char* sp_reduced; const char yes = '+'; const char no = '-'; const char separator = ' '; @@ -205,7 +205,7 @@ const char separator = ' '; is on; it is set to <CODE>false</CODE> otherwise. */ inline bool -get_field(std::istream& s, const std::string& keyword, bool& positive) { +get_field(std::istream& s, const char* keyword, bool& positive) { std::string str; if (!(s >> str) || (str[0] != yes && str[0] != no) diff --git a/src/Box_Status.cc b/src/Box_Status.cc new file mode 100644 index 0000000..b12709d --- /dev/null +++ b/src/Box_Status.cc @@ -0,0 +1,39 @@ +/* Box<ITV>::Status class implementation: data objects. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +namespace Boxes { + +// These are the keywords that indicate the individual assertions. +const char* empty_up_to_date = "EUP"; +const char* empty = "EM"; +const char* universe = "UN"; + +} // namespace Boxes + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library diff --git a/src/Box_Status_inlines.hh b/src/Box_Status_inlines.hh index 99c6289..de06585 100644 --- a/src/Box_Status_inlines.hh +++ b/src/Box_Status_inlines.hh @@ -155,9 +155,9 @@ namespace Implementation { namespace Boxes { // These are the keywords that indicate the individual assertions. -const std::string empty_up_to_date = "EUP"; -const std::string empty = "EM"; -const std::string universe = "UN"; +extern const char* empty_up_to_date; +extern const char* empty; +extern const char* universe; const char yes = '+'; const char no = '-'; const char separator = ' '; @@ -170,7 +170,7 @@ const char separator = ' '; is on; it is set to <CODE>false</CODE> otherwise. */ inline bool -get_field(std::istream& s, const std::string& keyword, bool& positive) { +get_field(std::istream& s, const char* keyword, bool& positive) { std::string str; if (!(s >> str) || (str[0] != yes && str[0] != no) diff --git a/src/Makefile.am b/src/Makefile.am index 963e58b..bcfb73b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -484,6 +484,9 @@ checked.cc \ Checked_Number.cc \ Float.cc \ fpu-ia32.cc \ +BDS_Status.cc \ +Box_Status.cc \ +Og_Status.cc \ Concrete_Expression.cc \ Constraint.cc \ Constraint_System.cc \ diff --git a/src/Og_Status.cc b/src/Og_Status.cc new file mode 100644 index 0000000..b5314f6 --- /dev/null +++ b/src/Og_Status.cc @@ -0,0 +1,39 @@ +/* BD_Shape<T>::Status class implementation: data objects. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +namespace Octagonal_Shapes { + +// These are the keywords that indicate the individual assertions. +const char* zero_dim_univ = "ZE"; +const char* empty = "EM"; +const char* strong_closed = "SC"; + +} // namespace Octagonal_Shapes + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library diff --git a/src/Og_Status_inlines.hh b/src/Og_Status_inlines.hh index f29ce12..090947e 100644 --- a/src/Og_Status_inlines.hh +++ b/src/Og_Status_inlines.hh @@ -153,9 +153,9 @@ namespace Implementation { namespace Octagonal_Shapes { // These are the keywords that indicate the individual assertions. -const std::string zero_dim_univ = "ZE"; -const std::string empty = "EM"; -const std::string strong_closed = "SC"; +extern const char* zero_dim_univ; +extern const char* empty; +extern const char* strong_closed; const char yes = '+'; const char no = '-'; const char separator = ' '; @@ -168,7 +168,7 @@ const char separator = ' '; is on; it is set to <CODE>false</CODE> otherwise. */ inline bool -get_field(std::istream& s, const std::string& keyword, bool& positive) { +get_field(std::istream& s, const char* keyword, bool& positive) { std::string str; if (!(s >> str) || (str[0] != yes && str[0] != no)

1 0

[GIT] ppl/ppl(master): Put under Git control.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: f841c4199161a865fbbbf1803a0193e9d2772d40 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f841c4199161… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 22:27:53 2014 +0100 Put under Git control. --- src/Handler.cc | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/Handler.cc b/src/Handler.cc new file mode 100644 index 0000000..f77b7d9 --- /dev/null +++ b/src/Handler.cc @@ -0,0 +1,31 @@ +/* Handler and derived classes' implementation (non-inline functions). + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +#include "ppl-config.h" +#include "Handler_defs.hh" + +namespace PPL = Parma_Polyhedra_Library; + +inline +PPL::Implementation::Watchdog::Handler::~Handler() { +}

1 0

[GIT] ppl/ppl(master): Guarantee that header file names are unique.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 89645ef2d50ea6c7ba965a6b12bca2e7c61bfb24 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=89645ef2d50e… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 21:50:49 2014 +0100 Guarantee that header file names are unique. Fixes violations of rule CP1.PRE08 detected by ECLAIR. --- src/Ask_Tell_inlines.hh | 2 +- src/BD_Shape_inlines.hh | 2 +- src/BD_Shape_templates.hh | 2 +- src/BHRZ03_Certificate.cc | 2 +- src/BHRZ03_Certificate_defs.hh | 2 +- src/Bit_Matrix_inlines.hh | 2 +- src/Bit_Row.cc | 2 +- src/Bit_Row_inlines.hh | 2 +- src/Checked_Number_templates.hh | 2 +- src/Congruence.cc | 2 +- src/Congruence_System.cc | 2 +- src/Constraint_System.cc | 2 +- src/DB_Matrix_inlines.hh | 2 +- src/DB_Row_inlines.hh | 2 +- src/Dense_Row.cc | 2 +- src/Dense_Row_inlines.hh | 2 +- src/Determinate_defs.hh | 2 +- src/Determinate_inlines.hh | 2 +- src/Float_defs.hh | 2 +- src/GMP_Integer_inlines.hh | 2 +- src/Generator_System.cc | 2 +- src/Grid_Certificate.cc | 2 +- src/Grid_Certificate_defs.hh | 2 +- src/Grid_Generator_System.cc | 2 +- src/Grid_Status.cc | 2 +- src/Grid_chdims.cc | 2 +- src/Grid_nonpublic.cc | 2 +- src/Grid_public.cc | 2 +- src/Grid_simplify.cc | 2 +- src/Grid_widenings.cc | 2 +- src/H79_Certificate.cc | 2 +- src/H79_Certificate_defs.hh | 2 +- src/Linear_Expression_Impl.cc | 2 +- src/Makefile.am | 4 ++-- src/OR_Matrix_inlines.hh | 2 +- src/Octagonal_Shape_inlines.hh | 2 +- src/Octagonal_Shape_templates.hh | 2 +- src/Partial_Function_inlines.hh | 2 +- src/Ph_Status.cc | 2 +- src/Poly_Con_Relation.cc | 2 +- src/Poly_Gen_Relation.cc | 2 +- src/Polyhedron_chdims.cc | 2 +- src/Polyhedron_nonpublic.cc | 2 +- src/Polyhedron_public.cc | 2 +- src/Polyhedron_widenings.cc | 2 +- src/Powerset_inlines.hh | 2 +- src/Powerset_templates.hh | 2 +- src/Ptr_Iterator_inlines.hh | 2 +- src/Result_inlines.hh | 2 +- src/Rounding_Dir_inlines.hh | 2 +- src/Swapping_Vector_defs.hh | 2 +- src/Widening_Function_inlines.hh | 2 +- src/algorithms.hh | 2 +- src/{assert.cc => assertions.cc} | 2 +- src/{assert.hh => assertions.hh} | 0 src/c_streambuf.cc | 2 +- src/checked_inlines.hh | 2 +- src/intervals_defs.hh | 2 +- src/math_utilities_inlines.hh | 2 +- src/ppl_header.hh | 2 +- src/stdiobuf.cc | 2 +- src/wrap_assign.hh | 2 +- src/wrap_string.cc | 2 +- 63 files changed, 63 insertions(+), 63 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=89645ef2…

1 0

[GIT] ppl/ppl(master): Provided virtual method anchors.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 0e03920b6f86875c95c084af53ba3ccb32c09e46 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e03920b6f86… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 20:09:22 2014 +0100 Provided virtual method anchors. Fixes violations of rule UCGP1.L4 detected by ECLAIR. --- src/Handler_inlines.hh | 4 ---- src/Makefile.am | 1 + src/PIP_Tree.cc | 3 +++ src/PIP_Tree_inlines.hh | 4 ---- src/c_streambuf.cc | 3 +++ src/c_streambuf_inlines.hh | 4 ---- src/globals.cc | 3 +++ src/globals_inlines.hh | 4 ---- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/Handler_inlines.hh b/src/Handler_inlines.hh index f725463..bd11dfe 100644 --- a/src/Handler_inlines.hh +++ b/src/Handler_inlines.hh @@ -30,10 +30,6 @@ namespace Implementation { namespace Watchdog { -inline -Handler::~Handler() { -} - template <typename Flag_Base, typename Flag> Handler_Flag<Flag_Base, Flag>::Handler_Flag(const Flag_Base* volatile& holder, Flag& flag) diff --git a/src/Makefile.am b/src/Makefile.am index 5e71c5b..f83cd76 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -493,6 +493,7 @@ Generator_System.cc \ Grid_Generator_System.cc \ Generator.cc \ Grid_Generator.cc \ +Handler.cc \ Init.cc \ Coefficient.cc \ Linear_Expression.cc \ diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index fe2318b..90728cb 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -923,6 +923,9 @@ PIP_Tree_Node::PIP_Tree_Node(const PIP_Tree_Node& y) artificial_parameters(y.artificial_parameters) { } +PIP_Tree_Node::~PIP_Tree_Node() { +} + PIP_Tree_Node::Artificial_Parameter ::Artificial_Parameter(const Linear_Expression& expr, Coefficient_traits::const_reference d) diff --git a/src/PIP_Tree_inlines.hh b/src/PIP_Tree_inlines.hh index 3340e64..0d20f24 100644 --- a/src/PIP_Tree_inlines.hh +++ b/src/PIP_Tree_inlines.hh @@ -52,10 +52,6 @@ PIP_Solution_Node::Tableau::denominator() const { return denom; } -inline -PIP_Tree_Node::~PIP_Tree_Node() { -} - inline void PIP_Tree_Node::set_parent(const PIP_Decision_Node* p) { parent_ = p; diff --git a/src/c_streambuf.cc b/src/c_streambuf.cc index 45b8713..a7cf3a6 100644 --- a/src/c_streambuf.cc +++ b/src/c_streambuf.cc @@ -28,6 +28,9 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +c_streambuf::~c_streambuf() { +} + c_streambuf::int_type c_streambuf::uflow() { const int_type c = underflow(); diff --git a/src/c_streambuf_inlines.hh b/src/c_streambuf_inlines.hh index d1070dc..34d15ae 100644 --- a/src/c_streambuf_inlines.hh +++ b/src/c_streambuf_inlines.hh @@ -31,10 +31,6 @@ c_streambuf::c_streambuf() : unget_char_buf(traits_type::eof()), next_char_buf(traits_type::eof()) { } -inline -c_streambuf::~c_streambuf() { -} - } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_c_streambuf_inlines_hh) diff --git a/src/globals.cc b/src/globals.cc index 042f595..0aa7a31 100644 --- a/src/globals.cc +++ b/src/globals.cc @@ -28,6 +28,9 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +Throwable::~Throwable() { +} + const Throwable* volatile abandon_expensive_computations = 0; // Initialize Weightwatch_Traits static data members. diff --git a/src/globals_inlines.hh b/src/globals_inlines.hh index 54d83da..8a16862 100644 --- a/src/globals_inlines.hh +++ b/src/globals_inlines.hh @@ -71,10 +71,6 @@ Weightwatch_Traits::from_delta(Threshold& threshold, const Delta& delta) { threshold = weight + delta; } -inline -Throwable::~Throwable() { -} - inline void maybe_abandon() { #ifndef NDEBUG

1 0

[GIT] ppl/ppl(master): Do not use `using namespace std'.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 364ef4de2a7f2f7a7091bc160cf2f043fb6c790b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=364ef4de2a7f… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 18:58:11 2014 +0100 Do not use `using namespace std'. Fixes violations of rule UCGP1.L3 detected by ECLAIR. --- demos/ppl_pips/ppl_pips.cc | 38 +++++++++++++++++++------------------- utils/timings.cc | 10 ++++------ 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 6731411..e4f56d7 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -118,55 +118,55 @@ pip_display_sol(std::ostream& out, const Parma_Polyhedra_Library::Variables_Set& vars, Parma_Polyhedra_Library::dimension_type space_dimension, int indent = 0) { - using namespace std; using namespace Parma_Polyhedra_Library::IO_Operators; + if (!pip) { - out << setw(indent*2) << "" << "_|_" << endl; + out << std::setw(indent*2) << "" << "_|_" << std::endl; } else { - for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator + for (PPL::PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator i = pip->art_parameter_begin(), i_end = pip->art_parameter_end(); i != i_end; ++i) { - out << setw(indent*2) << "" << "Parameter " - << Linear_Expression(Variable(space_dimension++)) - << " = " << *i << endl; + out << std::setw(indent*2) << "" << "Parameter " + << PPL::Linear_Expression(PPL::Variable(space_dimension++)) + << " = " << *i << std::endl; } - const Constraint_System &constraints = pip->constraints(); + const PPL::Constraint_System& constraints = pip->constraints(); const bool constraints_empty = constraints.empty(); if (!constraints_empty) { - out << setw(indent*2) << "" << "if "; - for (Constraint_System::const_iterator + out << std::setw(indent*2) << "" << "if "; + for (PPL::Constraint_System::const_iterator cs_begin = constraints.begin(), cs_end = constraints.end(), i = cs_begin; i != cs_end; ++i) { out << ((i == cs_begin) ? "" : " and ") << *i; } - out << " then" << endl; + out << " then" << std::endl; } - const PIP_Decision_Node* const decision_node_p = pip->as_decision(); + const PPL::PIP_Decision_Node* const decision_node_p = pip->as_decision(); if (decision_node_p) { pip_display_sol(out, decision_node_p->child_node(true), parameters, vars, space_dimension, indent+1); - out << setw(indent*2) << "" << "else" << endl; + out << std::setw(indent*2) << "" << "else" << std::endl; pip_display_sol(out, decision_node_p->child_node(false), parameters, vars, space_dimension, indent+1); } else { - const PIP_Solution_Node* const solution_node_p = pip->as_solution(); - out << setw(indent*2 + (constraints_empty ? 0 : 2)) << "" << "{"; - for (Variables_Set::const_iterator + const PPL::PIP_Solution_Node* const solution_node_p = pip->as_solution(); + out << std::setw(indent*2 + (constraints_empty ? 0 : 2)) << "" << "{"; + for (PPL::Variables_Set::const_iterator v_begin = vars.begin(), v_end = vars.end(), i = v_begin; i != v_end; ++i) { out << ((i == v_begin) ? "" : " ; ") - << solution_node_p->parametric_values(Variable(*i)); + << solution_node_p->parametric_values(PPL::Variable(*i)); } - out << "}" << endl; + out << "}" << std::endl; if (!constraints_empty) { - out << setw(indent*2) << "" << "else" << endl; - out << setw(indent*2 + 2) << "" << "_|_" << endl; + out << std::setw(indent*2) << "" << "else" << std::endl; + out << std::setw(indent*2 + 2) << "" << "_|_" << std::endl; } } } diff --git a/utils/timings.cc b/utils/timings.cc index 7986cdd..b18ea0d 100644 --- a/utils/timings.cc +++ b/utils/timings.cc @@ -41,8 +41,6 @@ site: http://bugseng.com/products/ppl/ . */ # include <sys/resource.h> #endif -using namespace std; - #ifdef PPL_HAVE_TIMEVAL // To save the time when start_clock is called. static struct timeval saved_ru_utime; @@ -53,7 +51,7 @@ start_clock() { #if PPL_HAVE_DECL_GETRUSAGE && defined(PPL_HAVE_TIMEVAL) struct rusage usage; if (getrusage(RUSAGE_SELF, &usage) != 0) { - cerr << "getrusage failed: " << strerror(errno) << endl; + std::cerr << "getrusage failed: " << strerror(errno) << std::endl; exit(1); } else { @@ -63,11 +61,11 @@ start_clock() { } void -print_clock(ostream& s) { +print_clock(std::ostream& s) { #if PPL_HAVE_DECL_GETRUSAGE && defined(PPL_HAVE_TIMEVAL) struct rusage usage; if (getrusage(RUSAGE_SELF, &usage) != 0) { - cerr << "getrusage failed: " << strerror(errno) << endl; + std::cerr << "getrusage failed: " << strerror(errno) << std::endl; exit(1); } else { @@ -96,7 +94,7 @@ print_clock(ostream& s) { } assert(csecs >= 0 && csecs < 100 && secs >= 0); const char fill_char = s.fill(); - s << secs << "." << setfill('0') << setw(2) << csecs; + s << secs << "." << std::setfill('0') << std::setw(2) << csecs; s.fill(fill_char); } #else

1 0

[GIT] ppl/ppl(master): Parenthesis spacing corrected.
by Roberto Bagnara 15 Dec '14

15 Dec '14

Module: ppl/ppl Branch: master Commit: ee1e7ff155068131b1d358c8f4df5c1b05196483 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ee1e7ff15506… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Mon Dec 15 19:46:22 2014 +0100 Parenthesis spacing corrected. Fixes violations of rule UCGP1.M1 detected by ECLAIR. --- src/CO_Tree.cc | 8 ++++---- src/CO_Tree_inlines.hh | 4 ++-- src/CO_Tree_templates.hh | 2 +- src/DB_Row_inlines.hh | 2 +- src/DB_Row_templates.hh | 6 +++--- src/Dense_Row.cc | 20 ++++++++++---------- src/Dense_Row_inlines.hh | 8 ++++---- src/MIP_Problem.cc | 4 ++-- src/checked_inlines.hh | 6 +++--- src/checked_mpq_inlines.hh | 4 ++-- src/checked_mpz_inlines.hh | 6 +++--- 11 files changed, 35 insertions(+), 35 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=ee1e7ff1…

1 0