diff options
| author | Markus Schwarzenberg <schwarzenberg@users.sourceforge.net> | 2007-03-01 09:43:25 +0000 |
|---|---|---|
| committer | schwarzenberg <schwarzenberg@users.sourceforge.net> | 2007-03-01 09:43:25 +0000 |
| commit | ad8869da712554d4ba090e1998f22d6c7afca4b2 (patch) | |
| tree | 9796bfbc1f2c072acf41f41bdc3238022d2db7ab /src/libcola | |
| parent | r14651@tres: ted | 2007-02-28 23:23:41 -0800 (diff) | |
| download | inkscape-ad8869da712554d4ba090e1998f22d6c7afca4b2.tar.gz inkscape-ad8869da712554d4ba090e1998f22d6c7afca4b2.zip | |
commited Solaris 2.8 / gcc-3.2.3 fixes
(bzr r2485)
Diffstat (limited to 'src/libcola')
| -rw-r--r-- | src/libcola/gradient_projection.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp index cec59c57a..78b141b3e 100644 --- a/src/libcola/gradient_projection.cpp +++ b/src/libcola/gradient_projection.cpp @@ -17,6 +17,9 @@ #include <libvpsc/constraint.h> #include "gradient_projection.h" #include <iostream> +#include "isnan.h" +#include "isinf.h" + using namespace std; using namespace vpsc; @@ -47,7 +50,7 @@ unsigned GradientProjection::solve(double * b) { solver = setupVPSC(); //cerr << "in gradient projection: n=" << n << endl; for (i=0;i<n;i++) { - assert(!isnan(place[i])); + assert(!isNaN(place[i])); assert(!isinf(place[i])); vars[i]->desiredPosition=place[i]; } @@ -95,7 +98,7 @@ unsigned GradientProjection::solve(double * b) { // move to new unconstrained position for (i=0; i<n; i++) { place[i]-=alpha*g[i]; - assert(!isnan(place[i])); + assert(!isNaN(place[i])); assert(!isinf(place[i])); vars[i]->desiredPosition=place[i]; } |