Mercurial > octave

diff liboctave/array/Sparse.cc @ 22327:d0562b3159c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move more classes inside octave namespace * ov-complex.cc, quit.h, lo-array-errwarn.h, lo-array-errwarn.cc, lo-array-gripes.cc: Move classes inside octave namespace. * NEWS, file-editor-tab.cc, Cell.cc, __qp__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, error.cc, error.h, errwarn.cc, errwarn.h, file-io.cc, gcd.cc, graphics.cc, graphics.in.h, gripes.cc, gripes.h, input.cc, interpreter.cc, interpreter.h, inv.cc, jit-typeinfo.cc, load-path.cc, ls-mat-ascii.cc, ls-mat5.cc, lsode.cc, mex.cc, oct-handle.h, oct-map.cc, oct-stream.cc, quad.cc, rand.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, sub2ind.cc, toplev.cc, utils.cc, variables.cc, xdiv.cc, xpow.cc, __eigs__.cc, __init_gnuplot__.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-class.cc, ov-classdef.cc, ov-complex.h, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-float.cc, ov-float.h, ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov.cc, op-cs-cs.cc, op-fcs-fcs.cc, op-fs-fs.cc, op-int.h, op-s-s.cc, ops.h, oct-parse.in.yy, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt.cc, Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc, MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, quit.cc, quit.h, gepbalance.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, cmd-edit.cc, lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc, lo-array-gripes.h, oct-binmap.h: Update to use namespace.
author John W. Eaton <jwe@octave.org>
date Wed, 17 Aug 2016 03:41:42 -0400
parents bac0d6f07a3e
children 4caa7b28d183
line wrap: on
line diff
--- a/liboctave/array/Sparse.cc	Wed Aug 17 02:57:50 2016 -0400
+++ b/liboctave/array/Sparse.cc	Wed Aug 17 03:41:42 2016 -0400
@@ -928,7 +928,7 @@
   else if (nc == 1)
     resize (n, 1);
   else
-    err_invalid_resize ();
+    octave::err_invalid_resize ();
 }
 
 template <typename T>
@@ -1158,7 +1158,7 @@
   const dim_vector idx_dims = idx.orig_dimensions ();
 
   if (idx.extent (nel) > nel)
-    err_del_index_out_of_range (true, idx.extent (nel), nel);
+    octave::err_del_index_out_of_range (true, idx.extent (nel), nel);
 
   if (nc == 1)
     {
@@ -1257,7 +1257,7 @@
       // Deleting columns.
       octave_idx_type lb, ub;
       if (idx_j.extent (nc) > nc)
-        err_del_index_out_of_range (false, idx_j.extent (nc), nc);
+        octave::err_del_index_out_of_range (false, idx_j.extent (nc), nc);
       else if (idx_j.is_cont_range (nc, lb, ub))
         {
           if (lb == 0 && ub == nc)
@@ -1295,7 +1295,7 @@
       // Deleting rows.
       octave_idx_type lb, ub;
       if (idx_i.extent (nr) > nr)
-        err_del_index_out_of_range (false, idx_i.extent (nr), nr);
+        octave::err_del_index_out_of_range (false, idx_i.extent (nr), nr);
       else if (idx_i.is_cont_range (nr, lb, ub))
         {
           if (lb == 0 && ub == nr)
@@ -1414,7 +1414,7 @@
   else if (idx.extent (nel) > nel)
     {
       if (! resize_ok)
-        err_index_out_of_range (1, 1, idx.extent (nel), nel, dims ());
+        octave::err_index_out_of_range (1, 1, idx.extent (nel), nel, dims ());
 
       // resize_ok is completely handled here.
       octave_idx_type ext = idx.extent (nel);
@@ -1602,9 +1602,9 @@
           retval = tmp.index (idx_i, idx_j);
         }
       else if (idx_i.extent (nr) > nr)
-        err_index_out_of_range (2, 1, idx_i.extent (nr), nr, dims ());
+        octave::err_index_out_of_range (2, 1, idx_i.extent (nr), nr, dims ());
       else
-        err_index_out_of_range (2, 2, idx_j.extent (nc), nc, dims ());
+        octave::err_index_out_of_range (2, 2, idx_j.extent (nc), nc, dims ());
     }
   else if (nr == 1 && nc == 1)
     {
@@ -1966,7 +1966,7 @@
         assign (idx, Sparse<T> (rhl, 1));
     }
   else
-    err_nonconformant ("=", dim_vector(idx.length (n),1), rhs.dims());
+    octave::err_nonconformant ("=", dim_vector(idx.length (n),1), rhs.dims());
 }
 
 template <typename T>
@@ -2206,7 +2206,7 @@
       assign (idx_i, idx_j, rhs.transpose ());
     }
   else
-    err_nonconformant  ("=", idx_i.length (nr), idx_j.length (nc), n, m);
+    octave::err_nonconformant  ("=", idx_i.length (nr), idx_j.length (nc), n, m);
 }
 
 // Can't use versions of these in Array.cc due to duplication of the