Fix build failures on some platforms.

Correct CMakeLists.txt after 2Geom sync - patch by su_v.

(bzr r14237)

4 files changed, 4 insertions, 10 deletions

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index 8a2884a2a..eb7abb614 100644
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -68,8 +68,6 @@ set(2geom_SRC
 	conic_section_clipper_cr.h
 	conic_section_clipper_impl.h
 	conicsec.h
-	conjugate_gradient.h
-	convex-cover.h
 	coord.h
 	crossing.h
 	curve.h
@@ -83,7 +81,6 @@ set(2geom_SRC
 	generic-interval.h
 	generic-rect.h
 	geom.h
-	hvlinesegment.h
 	int-interval.h
 	int-point.h
 	int-rect.h
@@ -91,19 +88,16 @@ set(2geom_SRC
 	line.h
 	linear.h
 	math-utils.h
-	nearest-point.h
 	ord.h
 	path-intersection.h
 	path-sink.h
 	path.h
 	pathvector.h
 	piecewise.h
-	point-ops.h
 	point.h
 	polynomial.h
 	ray.h
 	rect.h
-	region.h
 	sbasis-2d.h
 	sbasis-curve.h
 	sbasis-geometric.h
@@ -111,7 +105,6 @@ set(2geom_SRC
 	sbasis-poly.h
 	sbasis-to-bezier.h
 	sbasis.h
-	shape.h
 	solver.h
 	svg-path-parser.h
 	svg-path-writer.h
diff --git a/src/2geom/conicsec.cpp b/src/2geom/conicsec.cpp
index 3b36137be..089db71a4 100644
--- a/src/2geom/conicsec.cpp
+++ b/src/2geom/conicsec.cpp
@@ -1337,6 +1337,7 @@ bool xAx::decompose (Line& l1, Line& l2) const
  */
 Rect xAx::arc_bound (const Point & P1, const Point & Q, const Point & P2) const
 {
+    using std::swap;
     //std::cout << "BOUND: P1 = " << P1 << std::endl;
     //std::cout << "BOUND: Q = " << Q << std::endl;
     //std::cout << "BOUND: P2 = " << P2 << std::endl;
diff --git a/src/2geom/point.h b/src/2geom/point.h
index f2659d351..a66e64647 100644
--- a/src/2geom/point.h
+++ b/src/2geom/point.h
@@ -386,7 +386,9 @@ inline Coord distanceSq (Point const &a, Point const &b) {
 /// Test whether two points are no further apart than some threshold.
 /// @relates Point
 inline bool are_near(Point const &a, Point const &b, double eps = EPSILON) {
-    return are_near(distance(a, b), 0, eps);
+    // do not use an unqualified calls to distance before the empty
+    // specialization of iterator_traits is defined - see end of file
+    return are_near((a - b).length(), 0, eps);
 }
 
 /// Test whether three points lie approximately on the same line.
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index c4b92e579..8a097590a 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -3,7 +3,6 @@ set(live_effects_SRC
 	lpe-angle_bisector.cpp
 	lpe-attach-path.cpp
 	lpe-bendpath.cpp
-	lpe-boolops.cpp
 	lpe-bounding-box.cpp
 	lpe-bspline.cpp
 	lpe-circle_3pts.cpp
@@ -81,7 +80,6 @@ set(live_effects_SRC
 	lpe-angle_bisector.h
 	lpe-attach-path.h
 	lpe-bendpath.h
-	lpe-boolops.h
 	lpe-bounding-box.h
 	lpe-bspline.h
 	lpe-circle_3pts.h