From: Enblend <enb...@li...> - 2014-08-27 08:18:45
|
branch: details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hg/p/enblend/code/rev/68dfc2a4d239 changeset: 1083:68dfc2a4d239 user: Chris <cs...@us...> date: Wed Aug 27 09:35:42 2014 +0200 description: We certainly use C++11, therefore we can rely on isnan() being in the `std' namespace. diffstat: VERSION | 2 +- src/anneal.h | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diffs (24 lines): diff -r 8b5d45b41496 -r 68dfc2a4d239 VERSION --- a/VERSION Wed Aug 27 09:34:07 2014 +0200 +++ b/VERSION Wed Aug 27 09:35:42 2014 +0200 @@ -1,1 +1,1 @@ -4.2-18a9c1d411ac +4.2-8b5d45b41496 diff -r 8b5d45b41496 -r 68dfc2a4d239 src/anneal.h --- a/src/anneal.h Wed Aug 27 09:34:07 2014 +0200 +++ b/src/anneal.h Wed Aug 27 09:35:42 2014 +0200 @@ -393,13 +393,7 @@ for (unsigned i = j + 1U; i < localK; ++i) { const double piT = (*stateProbabilities)[i] + piTj; double piTAn = piT / (1.0 + schraudolph_exp(ej - E[i])); - if ( -#if defined(__sun__) - isnan(piTAn) -#else - std::isnan(piTAn) -#endif - ) { + if (EXPECT_RESULT(std::isnan(piTAn), false)) { // exp term is infinity or zero. piTAn = ej > E[i] ? 0.0 : piT; } |