mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
20 lines
617 B
Diff
20 lines
617 B
Diff
Fix redefinition of INFINITY
|
|
http://bugs.arb-home.de/ticket/830
|
|
http://bugs.arb-home.de/changeset/18606
|
|
--- GDE/MUSCLE/src/subfams.cpp.orig (revision 18605)
|
|
+++ GDE/MUSCLE/src/subfams.cpp (revision 18606)
|
|
@@ -2,5 +2,5 @@
|
|
#include "distfunc.h"
|
|
|
|
-const float INFINITY = float(1e29);
|
|
+const float FAR_AWAY_DISTANCE = float(1e29); // fixed by arb (old name was: INFINITY; clashed with math.h on OSX)
|
|
const unsigned NILL = uInsane;
|
|
|
|
@@ -44,5 +44,5 @@
|
|
for (unsigned i = 0; i < uNodeCount; ++i)
|
|
{
|
|
- ShortestPathEstimate[i] = INFINITY;
|
|
+ ShortestPathEstimate[i] = FAR_AWAY_DISTANCE;
|
|
Predecessor[i] = NILL;
|
|
}
|