Module: ppl/ppl Branch: master Commit: bd05d651cc3931ff02b0b57477bbca68c927f3ce URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bd05d651cc393... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Sat May 9 09:44:34 2009 +0200 Use the appropriate throw_dimension_incompatible() method in wrap_assign(). --- src/Grid_public.cc | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Grid_public.cc b/src/Grid_public.cc index 1f2cda5..35fff9f 100644 --- a/src/Grid_public.cc +++ b/src/Grid_public.cc @@ -2660,13 +2660,9 @@ PPL::Grid::wrap_assign(const Variables_Set& vars, const dimension_type space_dim = space_dimension(); // Dimension-compatibility check of `vars'. - if (space_dim < vars.space_dimension()) { - std::ostringstream s; - s << "PPL::Grid::wrap_assign(vars, ...):" << std::endl - << "this->space_dimension() == " << space_dim - << ", required space dimension == " << vars.space_dimension() << "."; - throw std::invalid_argument(s.str()); - } + const dimension_type min_space_dim = vars.space_dimension(); + if (space_dim < min_space_dim) + throw_dimension_incompatible("wrap_assign(vs, ...)", min_space_dim); // Wrapping an empty polyhedron is a no-op. if (marked_empty()) @@ -2683,10 +2679,9 @@ PPL::Grid::wrap_assign(const Variables_Set& vars, if (o == OVERFLOW_UNDEFINED) { for (Variables_Set::const_iterator i = vars.begin(), vars_end = vars.end(); i != vars.end(); ++i) { - const Variable x = Variable(*i); - // If x is a constant, do nothing. + // If `x' is a constant, do nothing. if (!gr.bounds(x, "wrap_assign(...)")) { if (gr.constrains(x)) // We know that x is not a constant,