summaryrefslogtreecommitdiffstats
path: root/src/libvpsc/block.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/libvpsc/block.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 'src/libvpsc/block.cpp')
-rw-r--r--src/libvpsc/block.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libvpsc/block.cpp b/src/libvpsc/block.cpp
index 221df536a..0bd662f28 100644
--- a/src/libvpsc/block.cpp
+++ b/src/libvpsc/block.cpp
@@ -72,7 +72,7 @@ void Block::setUpConstraintHeap(PairingHeap<Constraint*>* &h,bool in) {
for (Cit j=cs->begin();j!=cs->end();++j) {
Constraint *c=*j;
c->timeStamp=blockTimeCtr;
- if (c->left->block != this && in || c->right->block != this && !in) {
+ if ((c->left->block != this && in) || (c->right->block != this && !in)) {
h->insert(c);
}
}