Module: ppl/ppl Branch: sparse_matrices Commit: ae6854c3364fa0b4de0d66061a6bc1d490204f8e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae6854c3364fa...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Sun Dec 11 21:58:01 2011 +0100

Added missing name qualification.

---

src/termination.defs.hh | 26 +++++++++++++++----------- src/termination.templates.hh | 3 ++- 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/termination.defs.hh b/src/termination.defs.hh index 67160c7..906c5e7 100644 --- a/src/termination.defs.hh +++ b/src/termination.defs.hh @@ -35,23 +35,27 @@ namespace Parma_Polyhedra_Library {

class Termination_Helpers { public: - static void all_affine_ranking_functions_PR(const Constraint_System& cs_before, - const Constraint_System& cs_after, - NNC_Polyhedron& mu_space); - static bool one_affine_ranking_function_PR(const Constraint_System& cs_before, - const Constraint_System& cs_after, - Generator& mu); - static bool one_affine_ranking_function_PR_original(const Constraint_System& cs, - Generator& mu); - static void all_affine_ranking_functions_PR_original(const Constraint_System& cs, - NNC_Polyhedron& mu_space); + static void + all_affine_ranking_functions_PR(const Constraint_System& cs_before, + const Constraint_System& cs_after, + NNC_Polyhedron& mu_space); + static bool + one_affine_ranking_function_PR(const Constraint_System& cs_before, + const Constraint_System& cs_after, + Generator& mu); + static bool + one_affine_ranking_function_PR_original(const Constraint_System& cs, + Generator& mu); + static void + all_affine_ranking_functions_PR_original(const Constraint_System& cs, + NNC_Polyhedron& mu_space);

template <typename PSET> static void assign_all_inequalities_approximation(const PSET& pset_before, const PSET& pset_after, Constraint_System& cs); -}; +}; // class Termination_Helpers

/*! \brief Termination test using an improvement of the method by Mesnard and diff --git a/src/termination.templates.hh b/src/termination.templates.hh index 1055058..1803fca 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -403,7 +403,8 @@ all_affine_quasi_ranking_functions_MS_2(const PSET& pset_before,

using namespace Implementation::Termination; Constraint_System cs; - assign_all_inequalities_approximation(pset_before, pset_after, cs); + Termination_Helpers + ::assign_all_inequalities_approximation(pset_before, pset_after, cs); all_affine_quasi_ranking_functions_MS(cs, decreasing_mu_space, bounded_mu_space);