Mercurial > octave

diff src/pr-output.cc @ 11570:57632dea2446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
attempt better backward compatibility for Array constructors
author John W. Eaton <jwe@octave.org>
date Wed, 19 Jan 2011 17:55:56 -0500
parents e1851653d59c
children 7d6d8c1e471f
line wrap: on
line diff
--- a/src/pr-output.cc	Wed Jan 19 15:12:59 2011 -0500
+++ b/src/pr-output.cc	Wed Jan 19 17:55:56 2011 -0500
@@ -2011,7 +2011,7 @@
  \
           dim_vector dims = nda.dims (); \
  \
-          Array<octave_idx_type> ra_idx (ndims, 1, 0); \
+          Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);\
  \
           octave_idx_type m = 1; \
  \
@@ -2046,7 +2046,7 @@
                   nm += buf.str (); \
                 } \
  \
-              Array<idx_vector> idx (ndims, 1); \
+              Array<idx_vector> idx (dim_vector (ndims, 1)); \
  \
               idx(0) = idx_vector (':'); \
               idx(1) = idx_vector (':'); \
@@ -2055,7 +2055,7 @@
                 idx(k) = idx_vector (ra_idx(k)); \
  \
               octave_value page \
-                = MAT_T (Array<ELT_T> (nda.index (idx), nr, nc)); \
+                = MAT_T (Array<ELT_T> (nda.index (idx), dim_vector (nr, nc))); \
  \
               if (i != m - 1) \
                 { \
@@ -2855,7 +2855,7 @@
 
       dim_vector dims = nda.dims ();
 
-      Array<octave_idx_type> ra_idx (ndims, 1, 0);
+      Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);
 
       octave_idx_type m = 1;
 
@@ -2888,7 +2888,7 @@
               nm += buf.str ();
             }
 
-          Array<idx_vector> idx (ndims, 1);
+          Array<idx_vector> idx (dim_vector (ndims, 1));
 
           idx(0) = idx_vector (':');
           idx(1) = idx_vector (':');
@@ -2896,7 +2896,7 @@
           for (int k = 2; k < ndims; k++)
             idx(k) = idx_vector (ra_idx(k));
 
-          Array<std::string> page (nda.index (idx), nr, nc);
+          Array<std::string> page (nda.index (idx), dim_vector (nr, nc));
 
           // FIXME -- need to do some more work to put these
           // in neatly aligned columns...
@@ -3120,7 +3120,7 @@
     {
       int ndims = nda.ndims ();
 
-      Array<octave_idx_type> ra_idx (ndims, 1, 0);
+      Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);
 
       dim_vector dims = nda.dims ();
 
@@ -3155,7 +3155,7 @@
               os << nm << " =\n\n";
             }
 
-          Array<idx_vector> idx (ndims, 1);
+          Array<idx_vector> idx (dim_vector (ndims, 1));
 
           idx(0) = idx_vector (':');
           idx(1) = idx_vector (':');
@@ -3163,7 +3163,7 @@
           for (int k = 2; k < ndims; k++)
             idx(k) = idx_vector (ra_idx(k));
 
-          Array<T> page (nda.index (idx), nr, nc);
+          Array<T> page (nda.index (idx), dim_vector (nr, nc));
 
           for (octave_idx_type ii = 0; ii < nr; ii++)
             {
@@ -3191,7 +3191,7 @@
 
       dim_vector dims = nda.dims ();
 
-      Array<octave_idx_type> ra_idx (ndims, 1, 0);
+      Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);
 
       octave_idx_type m = 1;
 
@@ -3260,7 +3260,7 @@
               os << nm << " =\n\n";
             }
 
-          Array<idx_vector> idx (ndims, 1);
+          Array<idx_vector> idx (dim_vector (ndims, 1));
 
           idx(0) = idx_vector (':');
           idx(1) = idx_vector (':');
@@ -3268,7 +3268,7 @@
           for (int k = 2; k < ndims; k++)
             idx(k) = idx_vector (ra_idx(k));
 
-          Array<T> page (nda.index (idx), nr, nc);
+          Array<T> page (nda.index (idx), dim_vector (nr, nc));
 
           if (free_format)
             {