Mercurial > hg > octave-nkf

diff liboctave/numeric/lo-mappers.cc @ 19570:264ff6bf7475 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gnulib:: namespace for log, logf, localtime, and gmtime * load-save.cc, lo-mappers.cc, lo-specfun.cc, oct-time.cc: Sprinkle with gnulib:: to use log, logf, localtime, and gmtime from gnulib if they are needed.
author John W. Eaton <jwe@octave.org>
date Tue, 02 Dec 2014 09:56:50 -0500
parents ff4da3c8ed16
children 9ef286208da1
line wrap: on
line diff
--- a/liboctave/numeric/lo-mappers.cc
+++ b/liboctave/numeric/lo-mappers.cc
@@ -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