diff src/strfns.cc @ 8524:937921654627

clean up Array and DiagArray2
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 15 Jan 2009 07:22:24 +0100
parents 5451f7460ea6
children 732cb0236488
line wrap: on
line diff
--- a/src/strfns.cc	Thu Jan 15 07:22:24 2009 +0100
+++ b/src/strfns.cc	Thu Jan 15 07:22:24 2009 +0100
@@ -395,7 +395,7 @@
 	    {
 	      // Broadcast the string.
 
-	      boolNDArray output (cell.dimensions, false);
+	      boolNDArray output (cell.dims (), false);
 
 	      std::string s = r == 0 ? std::string () : str[0];
 
@@ -430,7 +430,7 @@
 		{
 		  // Must match in all dimensions.
 
-		  boolNDArray output (cell.dimensions, false);
+		  boolNDArray output (cell.dims (), false);
 
 		  if (cell.length () == r)
 		    {
@@ -471,8 +471,8 @@
 	      r2 = cell2.length ();
 	    }
 
-	  const dim_vector size1 = cell1.dimensions;
-	  const dim_vector size2 = cell2.dimensions;
+	  const dim_vector size1 = cell1.dims ();
+	  const dim_vector size2 = cell2.dims ();
 
 	  boolNDArray output (size1, false);
 
@@ -671,7 +671,7 @@
 	    {
 	      // Broadcast the string.
 
-	      boolNDArray output (cell.dimensions, false);
+	      boolNDArray output (cell.dims (), false);
 
 	      if (c < n)
 		{
@@ -724,7 +724,7 @@
 		{
 		  // Must match in all dimensions.
 
-		  boolNDArray output (cell.dimensions, false);
+		  boolNDArray output (cell.dims (), false);
 
 		  if (cell.numel () == r)
 		    {
@@ -774,8 +774,8 @@
 	      r2 = cell2.length ();
 	    }
 
-	  const dim_vector size1 = cell1.dimensions;
-	  const dim_vector size2 = cell2.dimensions;
+	  const dim_vector size1 = cell1.dims ();
+	  const dim_vector size2 = cell2.dims ();
 
 	  boolNDArray output (size1, false);