Mercurial > octave
diff liboctave/numeric/lo-mappers.cc @ 18928:161ebb78ac1b
use gnulib::log and gnulib::logf functions
* Faddeeva.cc, lo-mappers.cc, lo-specfun.cc: Use gnulib::log and
gnulib::logf instead of log and logf.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 16 Jul 2014 19:56:22 -0400 |
parents | ff4da3c8ed16 |
children | ba7e42dea4b2 |
line wrap: on
line diff
--- a/liboctave/numeric/lo-mappers.cc Wed Jul 16 19:55:30 2014 -0400 +++ b/liboctave/numeric/lo-mappers.cc Wed Jul 16 19:56:22 2014 -0400 @@ -101,7 +101,7 @@ #if defined (M_LN2) static double ln2 = M_LN2; #else - static double ln2 = log (2); + static double ln2 = gnulib::log (2); #endif return std::log (x) / ln2; @@ -116,7 +116,7 @@ #if defined (M_LN2) static double ln2 = M_LN2; #else - static double ln2 = log (2); + static double ln2 = gnulib::log (2); #endif return exp (x * ln2); @@ -522,14 +522,16 @@ rc_log (double x) { const double pi = 3.14159265358979323846; - return x < 0.0 ? Complex (log (-x), pi) : Complex (log (x)); + return x < 0.0 ? Complex (gnulib::log (-x), pi) : Complex (gnulib::log (x)); } FloatComplex rc_log (float x) { const float pi = 3.14159265358979323846f; - return x < 0.0f ? FloatComplex (logf (-x), pi) : FloatComplex (logf (x)); + return (x < 0.0f + ? FloatComplex (gnulib::logf (-x), pi) + : FloatComplex (gnulib::logf (x))); } Complex