Module: ppl/ppl Branch: master Commit: 35c29d765b0b2acd717b13a878fed3a742f728f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=35c29d765b0b2...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Sun Feb 12 10:24:21 2012 +0100

Avoid null statements that, apart from a comment, are not on a line by themselves. Detected by ECLAIR service nullstmt.

---

src/CO_Tree.cc | 2 +- src/MIP_Problem.cc | 2 +- src/globals.defs.hh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index bf45dec..68f9fe0 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -786,7 +786,7 @@ PPL::CO_Tree::rebalance(tree_iterator itr, dimension_type key, subtree_reserved_size = 2*subtree_reserved_size + 1; --itr_depth_minus_1; PPL_ASSERT(itr.depth() - 1 == itr_depth_minus_1); - }; + }

// Now the subtree rooted at itr has been chosen as the subtree to be // rebalanced. diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index c777be6..e3ad951 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -685,7 +685,7 @@ PPL::MIP_Problem::process_pending_constraints() { is_remergeable_variable)) { status = UNSATISFIABLE; return false; - }; + }

// Merge back any variable that was previously split into a positive // and a negative part and is now known to be nonnegative. diff --git a/src/globals.defs.hh b/src/globals.defs.hh index d30a292..9b59ba1 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -155,7 +155,9 @@ extern unsigned int in_assert; wp__.end(factor); \ } while(0) #else -#define WEIGHT_BEGIN() +#define WEIGHT_BEGIN() \ + do { \ + } while(0) #define WEIGHT_ADD(delta) \ do { \ Weightwatch_Traits::weight += (delta); \