diff libinterp/corefcn/gcd.cc @ 21942:aab79a1885cc

limit gnulib headers to liboctave/wrappers directory * libinterp/module.mk, liboctave/module.mk, src/module.mk, libgui/src/module.mk: Don't include libgnu directory in lists of include directories. * c-file-ptr-stream.cc, data.cc, dirfns.cc, file-io.cc, ft-text-renderer.cc, gcd.cc, gl2ps-print.cc, graphics.cc, mex.cc, oct-fstrm.cc, oct-procbuf.cc, oct-tex-lexer.in.ll, oct-tex-parser.in.yy, pr-output.cc, quadcc.cc, rand.cc, toplev.cc, utils.cc, __delaunayn__.cc, __init_fltk__.cc, __voronoi__.cc, convhulln.cc, ov-cell.cc, ov-float.cc, ov-scalar.cc, lex.ll, oct-parse.in.yy, Range.cc, idx-vector.cc, Faddeeva/Faddeeva.cc, lo-mappers.cc, lo-specfun.cc, randgamma.cc, randmtzig.cc, randpoisson.cc, dir-ops.cc, file-ops.cc, file-stat.cc, oct-env.cc, oct-syscalls.cc, oct-time.cc, oct-uname.cc, cmd-edit.cc, cmd-hist.cc, lo-utils.cc, oct-inttypes.cc, oct-shlib.cc, sparse-util.cc, mkoctfile.in.cc: Use std:: instead of gnulib:: namespace. * oct-conf-post.in.h: Don't define GNULIB_NAMESPACE.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Jun 2016 13:45:04 -0400
parents 2aef506f3fec
children 112b20240c87
line wrap: on
line diff
--- a/libinterp/corefcn/gcd.cc	Fri Jun 17 11:00:11 2016 -0400
+++ b/libinterp/corefcn/gcd.cc	Fri Jun 17 13:45:04 2016 -0400
@@ -63,8 +63,8 @@
 divide (const std::complex<FP>& a, const std::complex<FP>& b,
         std::complex<FP>& q, std::complex<FP>& r)
 {
-  FP qr = gnulib::floor ((a/b).real () + 0.5);
-  FP qi = gnulib::floor ((a/b).imag () + 0.5);
+  FP qr = std::floor ((a/b).real () + 0.5);
+  FP qi = std::floor ((a/b).imag () + 0.5);
 
   q = std::complex<FP> (qr, qi);
 
@@ -128,7 +128,7 @@
 
   while (bb != 0)
     {
-      double qq = gnulib::floor (aa / bb);
+      double qq = std::floor (aa / bb);
       double tt = fmod (aa, bb);
 
       aa = bb;