Mercurial > octave

diff libinterp/corefcn/Cell.cc @ 29569:29a1f8fd8ee6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move idx_vector classes inside octave namespace * idx-vector.h, idx-vector.cc: Move idx_vector classes inside octave namespace. Update all uses outside of octave namespace to use octave:: tag. * Sparse.h: Eliminate forward declaration of idx_vector.
author John W. Eaton <jwe@octave.org>
date Wed, 28 Apr 2021 13:46:02 -0400
parents 7854d5752dd2
children aef11bb4e6d1
line wrap: on
line diff
--- a/libinterp/corefcn/Cell.cc	Wed Apr 28 12:55:19 2021 -0400
+++ b/libinterp/corefcn/Cell.cc	Wed Apr 28 13:46:02 2021 -0400
@@ -191,7 +191,7 @@
 
         case 1:
           {
-            idx_vector i = idx_arg(0).index_vector ();
+            octave::idx_vector i = idx_arg(0).index_vector ();
 
             retval = Array<octave_value>::index (i, resize_ok, Matrix ());
           }
@@ -199,10 +199,10 @@
 
         case 2:
           {
-            idx_vector i = idx_arg(0).index_vector ();
+            octave::idx_vector i = idx_arg(0).index_vector ();
 
             k = 1;
-            idx_vector j = idx_arg(1).index_vector ();
+            octave::idx_vector j = idx_arg(1).index_vector ();
 
             retval = Array<octave_value>::index (i, j, resize_ok, Matrix ());
           }
@@ -210,7 +210,7 @@
 
         default:
           {
-            Array<idx_vector> iv (dim_vector (n, 1));
+            Array<octave::idx_vector> iv (dim_vector (n, 1));
 
             for (k = 0; k < n; k++)
               iv(k) = idx_arg(k).index_vector ();
@@ -245,7 +245,7 @@
 {
   octave_idx_type len = idx_arg.length ();
 
-  Array<idx_vector> ra_idx (dim_vector (len, 1));
+  Array<octave::idx_vector> ra_idx (dim_vector (len, 1));
 
   for (octave_idx_type i = 0; i < len; i++)
     {
@@ -270,7 +270,7 @@
 {
   octave_idx_type len = idx_arg.length ();
 
-  Array<idx_vector> ra_idx (dim_vector (len, 1));
+  Array<octave::idx_vector> ra_idx (dim_vector (len, 1));
 
   for (octave_idx_type i = 0; i < len; i++)
     try