From e471a664f923f517b68071f2e33fbb6ce070f8b7 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 8 Aug 2016 13:56:40 +0100
Subject: Remove deprecated Autotools and btool files.  Please use CMake
 instead

(bzr r15046)
---
 src/libcola/Makefile_insert | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 src/libcola/Makefile_insert

(limited to 'src/libcola')

diff --git a/src/libcola/Makefile_insert b/src/libcola/Makefile_insert
deleted file mode 100644
index dc032a289..000000000
--- a/src/libcola/Makefile_insert
+++ /dev/null
@@ -1,18 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-libcola/all: libcola.a
-
-libcola/clean:
-	rm -f libcola/libcola.a $(libcola_libcola_a_OBJECTS)
-
-libcola_libcola_a_SOURCES = libcola/cola.h\
-	libcola/cola.cpp\
-	libcola/conjugate_gradient.cpp\
-	libcola/conjugate_gradient.h\
-	libcola/gradient_projection.cpp\
-	libcola/gradient_projection.h\
-	libcola/shortest_paths.cpp\
-	libcola/shortest_paths.h\
-	libcola/straightener.h\
-	libcola/straightener.cpp\
-	libcola/connected_components.cpp
-- 
cgit v1.2.3


From 1e3e159499532a145cf09af2dbd1de2ae4d8d565 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 6 Feb 2017 15:34:17 +0000
Subject: Remove some unneeded < C++11 fallback code

(bzr r15485)
---
 src/libcola/gradient_projection.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libcola')

diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp
index 3e41aceac..c8488a545 100644
--- a/src/libcola/gradient_projection.cpp
+++ b/src/libcola/gradient_projection.cpp
@@ -18,7 +18,6 @@
 #include "gradient_projection.h"
 #include <iostream>
 #include <2geom/math-utils.h>
-#include "isinf.h"
 #include <math.h>
 
 using namespace std;
-- 
cgit v1.2.3


From 2d607cec2e3a62427e6c6beb4f3e3c28e3770ac6 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 15 Feb 2017 07:50:11 +0100
Subject: Fix compile for Trusty. (Colliding definitions of isinf between C99
 and C++11 with GCC.)

(bzr r15521)
---
 src/libcola/gradient_projection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libcola')

diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp
index c8488a545..c079c3149 100644
--- a/src/libcola/gradient_projection.cpp
+++ b/src/libcola/gradient_projection.cpp
@@ -50,7 +50,7 @@ unsigned GradientProjection::solve(double * b) {
     //cerr << "in gradient projection: n=" << n << endl;
     for (i=0;i<n;i++) {
         assert(!IS_NAN(place[i]));
-        assert(!isinf(place[i]));
+        assert(IS_FINITE(place[i]));
         vars[i]->desiredPosition=place[i];
     }
     try {
@@ -98,7 +98,7 @@ unsigned GradientProjection::solve(double * b) {
 		for (i=0; i<n; i++) {
 			place[i]-=alpha*g[i];
             assert(!IS_NAN(place[i]));
-            assert(!isinf(place[i]));
+            assert(IS_FINITE(place[i]));
             vars[i]->desiredPosition=place[i];
 		}
         for (DummyVars::iterator it=dummy_vars.begin();it!=dummy_vars.end();++it){
-- 
cgit v1.2.3