From dcf765f3dcbff2e65428e0f002bb5ea3648940f0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 25 Jun 2011 15:35:01 +0000
Subject: warning cleanup (no functional changes) - enclose && / || with
 brackets to avoid ambiguity. - don't cast from booleans to pointers.

(bzr r10359)
---
 src/libvpsc/block.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libvpsc')

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);
 			}
 		}
-- 
cgit v1.2.3


From 4d613dc583b96ea9205cd06f229956d6ec56c9e6 Mon Sep 17 00:00:00 2001
From: Nick Drobchenko <xepecine@gmail.com>
Date: Tue, 5 Jul 2011 19:12:43 +0400
Subject: Gcodetools have been upgraded to v. 1.7.

(bzr r10417)
---
 src/libvpsc/CMakeLists.txt | 58 +++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/libvpsc')

diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt
index 8db059b5d..4099900b5 100644
--- a/src/libvpsc/CMakeLists.txt
+++ b/src/libvpsc/CMakeLists.txt
@@ -1,29 +1,29 @@
-
-set(libvpsc_SRC
-	block.cpp
-	blocks.cpp
-	constraint.cpp
-	csolve_VPSC.cpp
-	generate-constraints.cpp
-	remove_rectangle_overlap.cpp
-	solve_VPSC.cpp
-	variable.cpp
-	pairingheap/PairingHeap.cpp
-
-
-	# -------
-	# Headers
-	block.h
-	blocks.h
-	constraint.h
-	csolve_VPSC.h
-	generate-constraints.h
-	pairingheap/PairingHeap.h
-	pairingheap/dsexceptions.h
-	placement_SolveVPSC.h
-	remove_rectangle_overlap.h
-	solve_VPSC.h
-	variable.h
-)
-
-add_inkscape_lib(vpsc_LIB "${libvpsc_SRC}")
+
+set(libvpsc_SRC
+	block.cpp
+	blocks.cpp
+	constraint.cpp
+	csolve_VPSC.cpp
+	generate-constraints.cpp
+	remove_rectangle_overlap.cpp
+	solve_VPSC.cpp
+	variable.cpp
+	pairingheap/PairingHeap.cpp
+
+
+	# -------
+	# Headers
+	block.h
+	blocks.h
+	constraint.h
+	csolve_VPSC.h
+	generate-constraints.h
+	pairingheap/PairingHeap.h
+	pairingheap/dsexceptions.h
+	placement_SolveVPSC.h
+	remove_rectangle_overlap.h
+	solve_VPSC.h
+	variable.h
+)
+
+add_inkscape_lib(vpsc_LIB "${libvpsc_SRC}")
-- 
cgit v1.2.3