Mercurial > octave

diff libinterp/corefcn/sparse-xdiv.cc @ 21723:bae585228161

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use namespace for numeric_limits * lo-ieee.h (octave_numeric_limits): Rename to numeric_limits and define inside octave namespace. * Canvas.cc, data.cc, graphics.cc, graphics.in.h, oct-handle.h, oct-stream.cc, quadcc.cc, sparse-xdiv.cc, str2double.cc, variables.h, __glpk__.cc, __init_fltk__.cc, __voronoi__.cc, octave.cc, CMatrix.cc, CNDArray.cc, CSparse.cc, Sparse-C.cc, dDiagMatrix.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fCNDArray.cc, fDiagMatrix.cc, fMatrix.cc, Faddeeva.cc, eigs-base.cc, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, oct-norm.cc, oct-rand.cc, oct-rand.h, oct-spparms.cc, randgamma.cc, randpoisson.cc, lo-utils.cc: Change all uses of octave_numeric_limits to octave::numeric_limits.
author John W. Eaton <jwe@octave.org>
date Tue, 17 May 2016 11:32:53 -0400
parents bcc30b45a225
children aba2e6293dd8
line wrap: on
line diff
--- a/libinterp/corefcn/sparse-xdiv.cc	Tue May 17 01:23:24 2016 -0400
+++ b/libinterp/corefcn/sparse-xdiv.cc	Tue May 17 11:32:53 2016 -0400
@@ -375,11 +375,11 @@
 
   Matrix result;
   if (a == 0.)
-    result = Matrix (nr, nc, octave_numeric_limits<double>::NaN ());
+    result = Matrix (nr, nc, octave::numeric_limits<double>::NaN ());
   else if (a > 0.)
-    result = Matrix (nr, nc, octave_numeric_limits<double>::Inf ());
+    result = Matrix (nr, nc, octave::numeric_limits<double>::Inf ());
   else
-    result = Matrix (nr, nc, -octave_numeric_limits<double>::Inf ());
+    result = Matrix (nr, nc, -octave::numeric_limits<double>::Inf ());
 
 
   for (octave_idx_type j = 0; j < nc; j++)
@@ -398,7 +398,7 @@
   octave_idx_type nr = b.rows ();
   octave_idx_type nc = b.cols ();
 
-  ComplexMatrix result (nr, nc, Complex (octave_numeric_limits<double>::NaN (), octave_numeric_limits<double>::NaN ()));
+  ComplexMatrix result (nr, nc, Complex (octave::numeric_limits<double>::NaN (), octave::numeric_limits<double>::NaN ()));
 
   for (octave_idx_type j = 0; j < nc; j++)
     for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++)