diff --git a/matexp.h b/matexp.h index af3f22c..100da1c 100644 --- a/matexp.h +++ b/matexp.h @@ -218,7 +218,7 @@ while((i >>= 1)/*!=0*/) return y; } -inline int nextpow2(const double n) +inline int mynextpow2(const double n) { const double log2=std::log(2.); if(n<=.75) return 0; //try to keep the taylor expansion short @@ -260,7 +260,7 @@ NRVec exp_aux(const T &x, int &power, int maxpower, int maxtaylor, S prescale { double mnorm= x.norm() * std::abs(prescale); -power=nextpow2(mnorm); +power=mynextpow2(mnorm); if(maxpower>=0 && power>maxpower) power=maxpower; double scale=std::exp(-std::log(2.)*power); @@ -298,7 +298,7 @@ template void sincos_aux(NRVec &si, NRVec &co, const T &x, int &power,int maxpower, int maxtaylor, const S prescale) { double mnorm= x.norm() * std::abs(prescale); -power=nextpow2(mnorm); +power=mynextpow2(mnorm); if(maxpower>=0 && power>maxpower) power=maxpower; double scale=std::exp(-std::log(2.)*power);