summaryrefslogtreecommitdiffstats
path: root/src/libavoid/vpsc.cpp
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-25 15:35:01 +0000
committerCampbell Barton <ideasman42@gmail.com>2011-06-25 15:35:01 +0000
commitdcf765f3dcbff2e65428e0f002bb5ea3648940f0 (patch)
tree307d762b00b7ef44a24b31cb434d00e46ede7140 /src/libavoid/vpsc.cpp
parentadded a Modules cmake dir, only use for find_package, reference cmake include... (diff)
downloadinkscape-dcf765f3dcbff2e65428e0f002bb5ea3648940f0.tar.gz
inkscape-dcf765f3dcbff2e65428e0f002bb5ea3648940f0.zip
warning cleanup (no functional changes)
- enclose && / || with brackets to avoid ambiguity. - don't cast from booleans to pointers. (bzr r10359)
Diffstat (limited to '')
-rw-r--r--src/libavoid/vpsc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libavoid/vpsc.cpp b/src/libavoid/vpsc.cpp
index 19d360375..1646ddaaa 100644
--- a/src/libavoid/vpsc.cpp
+++ b/src/libavoid/vpsc.cpp
@@ -422,7 +422,7 @@ Constraint* IncSolver::mostViolated(Constraints &l) {
// downwards. There is always at least 1 element in the
// vector because of search.
// TODO check this logic and add parens:
- if((deletePoint != end) && ((minSlack < ZERO_UPPERBOUND) && !v->active || v->equality)) {
+ if((deletePoint != end) && (((minSlack < ZERO_UPPERBOUND) && !v->active) || v->equality)) {
*deletePoint = l[l.size()-1];
l.resize(l.size()-1);
}