Mercurial > octave

diff libinterp/octave-value/ov.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 e88444be8468
children aef11bb4e6d1
line wrap: on
line diff
--- a/libinterp/octave-value/ov.cc	Wed Apr 28 12:55:19 2021 -0400
+++ b/libinterp/octave-value/ov.cc	Wed Apr 28 13:46:02 2021 -0400
@@ -1004,22 +1004,22 @@
   maybe_mutate ();
 }
 
-octave_value::octave_value (const idx_vector& idx, bool lazy)
+octave_value::octave_value (const octave::idx_vector& idx, bool lazy)
   : rep ()
 {
   double scalar;
   octave::range<double> range;
   NDArray array;
   boolNDArray mask;
-  idx_vector::idx_class_type idx_class;
+  octave::idx_vector::idx_class_type idx_class;
 
   if (lazy)
     {
       // Only make lazy indices out of ranges and index vectors.
       switch (idx.idx_class ())
         {
-        case idx_vector::class_range:
-        case idx_vector::class_vector:
+        case octave::idx_vector::class_range:
+        case octave::idx_vector::class_vector:
           rep = new octave_lazy_index (idx);
           maybe_mutate ();
           return;
@@ -1033,23 +1033,23 @@
 
   switch (idx_class)
     {
-    case idx_vector::class_colon:
+    case octave::idx_vector::class_colon:
       rep = new octave_magic_colon ();
       break;
 
-    case idx_vector::class_range:
+    case octave::idx_vector::class_range:
       rep = new octave_range (range, idx);
       break;
 
-    case idx_vector::class_scalar:
+    case octave::idx_vector::class_scalar:
       rep = new octave_scalar (scalar);
       break;
 
-    case idx_vector::class_vector:
+    case octave::idx_vector::class_vector:
       rep = new octave_matrix (array, idx);
       break;
 
-    case idx_vector::class_mask:
+    case octave::idx_vector::class_mask:
       rep = new octave_bool_matrix (mask, idx);
       break;