From e1c41c8df483b1f32fc319d8c5286c4e4c81a461 Mon Sep 17 00:00:00 2001 From: jiho-sf Date: Tue, 1 May 2007 21:41:07 +0000 Subject: [PATCH] committed patch 1710682 by jfaith - in src/libcola/cola.cpp, isnan is used and not the cross-platform definition isNaN defined in isnan.h => replaced isnan by isNaN and included isnan.h - add math.h include in src/libcola/gradient_projection.cpp This was necessary because libcola does not compile for OS X 10.3.9 --- src/libcola/cola.cpp | 3 ++- src/libcola/gradient_projection.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcola/cola.cpp b/src/libcola/cola.cpp index 74cab50da..afad49eb2 100644 --- a/src/libcola/cola.cpp +++ b/src/libcola/cola.cpp @@ -2,6 +2,7 @@ #include "conjugate_gradient.h" #include "straightener.h" #include "shortest_paths.h" +#include "isnan.h" namespace cola { @@ -131,7 +132,7 @@ void ConstrainedMajorizationLayout::majlayout( } b[i] += degree * coords[i]; } - assert(!isnan(b[i])); + assert(!isNaN(b[i])); } if(constrainedLayout) { setupDummyVars(); diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp index 78b141b3e..94844ca88 100644 --- a/src/libcola/gradient_projection.cpp +++ b/src/libcola/gradient_projection.cpp @@ -19,7 +19,7 @@ #include #include "isnan.h" #include "isinf.h" - +#include using namespace std; using namespace vpsc; -- 2.30.2