gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

sci-biology/allpathslg: replace isnan macro with proper std::isnan function

Browse Source 
Gentoo-Bug: 580086

Package-Manager: portage-2.2.28
This commit is contained in:
David Seifert
2016-05-05 20:11:32 +02:00
parent 52982a6840
commit 71fb540e91
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sci-biology/allpathslg/files/allpathslg-52488_remove-namespace-std.patch
View File

@@ -890,10 +890,12 @@ https://bugs.gentoo.org/show_bug.cgi?id=568440
bool IsBubbleEdge(int eid, const HyperBasevector& hb, const vec<int>& to_left,
--- allpathslg-52488/src/paths/long/VariantReadSupport.cc
+++ allpathslg-52488/src/paths/long/VariantReadSupport.cc
@@ -23,6 +23,11 @@
@@ -23,6 +23,13 @@
#include "paths/long/ReadOriginTracker.h"
#include "paths/long/EvalByReads.h"
+#include <cmath>
+
+using std::get;
+using std::make_tuple;
+using std::ignore;
@@ -902,6 +904,24 @@ https://bugs.gentoo.org/show_bug.cgi?id=568440
namespace {
void CalcLengthProbSimple(vec<double>&vOut,const double dProbIns_len, const double dProbDel_len, const uint64_t org_length){
const double dProbIns=dProbIns_len;
@@ -158,7 +165,7 @@
for(uint64_t ff=1;ff<nFlavors;++ff){
for( size_t ll = 2 ; ll <= get<0>(n_q_len[ff]) ; ++ll){ dFactor /= (long double)(ll); }
}
- if( dFactor==std::numeric_limits<long double>::infinity() || isnan(dFactor) ){ dFactor=1.0; }
+ if( dFactor==std::numeric_limits<long double>::infinity() || std::isnan(dFactor) ){ dFactor=1.0; }
if(verbosity>0) std::cout << "dFactor " << dFactor << std::endl;
long double dDenom=0.0;
@@ -193,7 +200,7 @@
}
}
if(verbosity>0) std::cout <<"denom: " << dDenom<< std::endl;
- if( dDenom < std::numeric_limits<long double>::epsilon() * 100 || isnan(dDenom)) return;
+ if( dDenom < std::numeric_limits<long double>::epsilon() * 100 || std::isnan(dDenom)) return;
ForceAssert(dDenom>0);
if(verbosity>0){
for( uint64_t row=0;row<nFlavors;++row){
--- allpathslg-52488/src/paths/long/VariantReadSupport.h
+++ allpathslg-52488/src/paths/long/VariantReadSupport.h
@@ -5,6 +5,8 @@