diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-02-15 06:50:11 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2017-02-15 06:50:11 +0000 |
| commit | 2d607cec2e3a62427e6c6beb4f3e3c28e3770ac6 (patch) | |
| tree | 391df5900c763a51a28352d58aa4d5120319e927 /src/libcola/gradient_projection.cpp | |
| parent | Rewrite and cleanup of style dialog. Still WIP. (diff) | |
| download | inkscape-2d607cec2e3a62427e6c6beb4f3e3c28e3770ac6.tar.gz inkscape-2d607cec2e3a62427e6c6beb4f3e3c28e3770ac6.zip | |
Fix compile for Trusty. (Colliding definitions of isinf between C99 and C++11 with GCC.)
(bzr r15521)
Diffstat (limited to 'src/libcola/gradient_projection.cpp')
| -rw-r--r-- | src/libcola/gradient_projection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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){ |