From 8a38c52bce619b07117cdd87a183eb05fb51e28e Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Fri, 6 Jun 2008 01:43:35 +0000 Subject: merge gsoc2008_johan_path2geom into trunk (bzr r5823) --- src/libvpsc/generate-constraints.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libvpsc/generate-constraints.cpp') diff --git a/src/libvpsc/generate-constraints.cpp b/src/libvpsc/generate-constraints.cpp index 3574a2743..f3bc65eed 100644 --- a/src/libvpsc/generate-constraints.cpp +++ b/src/libvpsc/generate-constraints.cpp @@ -79,8 +79,8 @@ bool CmpNodePos::operator() (const Node* u, const Node* v) const { if (v->pos < u->pos) { return false; } - if (isNaN(u->pos) != isNaN(v->pos)) { - return isNaN(u->pos); + if (IS_NAN(u->pos) != IS_NAN(v->pos)) { + return IS_NAN(u->pos); } return u < v; @@ -153,9 +153,9 @@ int compare_events(const void *a, const void *b) { return 1; } else if(ea->pos < eb->pos) { return -1; - } else if(isNaN(ea->pos) != isNaN(ea->pos)) { + } else if(IS_NAN(ea->pos) != IS_NAN(ea->pos)) { /* See comment in CmpNodePos. */ - return ( isNaN(ea->pos) + return ( IS_NAN(ea->pos) ? -1 : 1 ); } -- cgit v1.2.3