Mercurial > jwe > octave

changeset 4054:ac132116db86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-08-17 23:00:00 by jwe]
author jwe
date Sat, 17 Aug 2002 23:00:01 +0000
parents 1fb249b4d1bb
children 7690958e7726
files liboctave/Array-idx.h liboctave/Array.cc liboctave/Array.h liboctave/Array2-idx.h liboctave/Array2.cc liboctave/Array3.cc liboctave/ArrayN.cc liboctave/ChangeLog liboctave/DiagArray2.cc
diffstat 9 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array-idx.h	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/Array-idx.h	Sat Aug 17 23:00:01 2002 +0000
@@ -165,7 +165,7 @@
 	      if (--rep->count <= 0)
 		delete rep;
 
-	      rep = new ArrayRep (new_data, new_len);
+	      rep = new typename Array<T>::ArrayRep (new_data, new_len);
 
 	      set_max_indices (1);
 	    }
--- a/liboctave/Array.cc	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/Array.cc	Sat Aug 17 23:00:01 2002 +0000
@@ -48,7 +48,7 @@
 template <class T>
 Array<T>::Array (int n, const T& val)
 {
-  rep = new ArrayRep (n);
+  rep = new typename Array<T>::ArrayRep (n);
 
   for (int i = 0; i < n; i++)
     rep->data[i] = val;
@@ -105,11 +105,11 @@
   if (n == length ())
     return;
 
-  ArrayRep *old_rep = rep;
+  typename Array<T>::ArrayRep *old_rep = rep;
   const T *old_data = data ();
   int old_len = length ();
 
-  rep = new ArrayRep (n);
+  rep = new typename Array<T>::ArrayRep (n);
 
   if (old_data && old_len > 0)
     {
@@ -136,11 +136,11 @@
   if (n == length ())
     return;
 
-  ArrayRep *old_rep = rep;
+  typename Array<T>::ArrayRep *old_rep = rep;
   const T *old_data = data ();
   int old_len = length ();
 
-  rep = new ArrayRep (n);
+  rep = new typename Array<T>::ArrayRep (n);
 
   int min_len = old_len < n ? old_len : n;
 
@@ -164,7 +164,7 @@
   if (rep->count > 1)
     {
       --rep->count;
-      rep = new ArrayRep (*rep);
+      rep = new typename Array<T>::ArrayRep (*rep);
     }
   return rep->data;
 }
--- a/liboctave/Array.h	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/Array.h	Sat Aug 17 23:00:01 2002 +0000
@@ -108,11 +108,11 @@
 
 protected:
 
-  ArrayRep *rep;
+  typename Array<T>::ArrayRep *rep;
 
   Array (T *d, int l)
     {
-      rep = new ArrayRep (d, l);
+      rep = new typename Array<T>::ArrayRep (d, l);
 
 #ifdef HEAVYWEIGHT_INDEXING
       idx = 0;
@@ -125,7 +125,7 @@
 
   Array (void)
     {
-      rep = new ArrayRep ();
+      rep = new typename Array<T>::ArrayRep ();
 
 #ifdef HEAVYWEIGHT_INDEXING
       idx = 0;
@@ -136,7 +136,7 @@
 
   explicit Array (int n)
     {
-      rep = new ArrayRep (n);
+      rep = new typename Array<T>::ArrayRep (n);
 
 #ifdef HEAVYWEIGHT_INDEXING
       idx = 0;
--- a/liboctave/Array2-idx.h	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/Array2-idx.h	Sat Aug 17 23:00:01 2002 +0000
@@ -281,7 +281,7 @@
 	  if (--rep->count <= 0)
 	    delete rep;
 
-	  rep = new Array<T>::ArrayRep (new_data, new_n);
+	  rep = new typename Array<T>::ArrayRep (new_data, new_n);
 
 	  if (nr == 1)
 	    {
@@ -395,7 +395,7 @@
 		      if (--rep->count <= 0)
 			delete rep;
 
-		      rep = new Array<T>::ArrayRep (new_data, nr * new_nc);
+		      rep = new typename Array<T>::ArrayRep (new_data, nr * new_nc);
 
 		      d2 = new_nc;
 
@@ -459,7 +459,7 @@
 		      if (--rep->count <= 0)
 			delete rep;
 
-		      rep = new Array<T>::ArrayRep (new_data, new_nr * nc);
+		      rep = new typename Array<T>::ArrayRep (new_data, new_nr * nc);
 
 		      d1 = new_nr;
 
--- a/liboctave/Array2.cc	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/Array2.cc	Sat Aug 17 23:00:01 2002 +0000
@@ -129,7 +129,7 @@
   int old_d2 = dim2 ();
   int old_len = length ();
 
-  rep = new Array<T>::ArrayRep (get_size (r, c));
+  rep = new typename Array<T>::ArrayRep (get_size (r, c));
 
   d1 = r;
   d2 = c;
@@ -169,7 +169,7 @@
   int old_d2 = dim2 ();
   int old_len = length ();
 
-  rep = new Array<T>::ArrayRep (get_size (r, c));
+  rep = new typename Array<T>::ArrayRep (get_size (r, c));
 
   d1 = r;
   d2 = c;
--- a/liboctave/Array3.cc	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/Array3.cc	Sat Aug 17 23:00:01 2002 +0000
@@ -68,7 +68,7 @@
 
   int ts = get_size (get_size (r, c), p);
 
-  rep = new Array<T>::ArrayRep (ts);
+  rep = new typename Array<T>::ArrayRep (ts);
 
   d1 = r;
   d2 = c;
@@ -115,7 +115,7 @@
 
   int ts = get_size (get_size (r, c), p);
 
-  rep = new Array<T>::ArrayRep (ts);
+  rep = new typename Array<T>::ArrayRep (ts);
 
   d1 = r;
   d2 = c;
--- a/liboctave/ArrayN.cc	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/ArrayN.cc	Sat Aug 17 23:00:01 2002 +0000
@@ -230,7 +230,7 @@
   typename Array<T>::ArrayRep *old_rep = rep;
   const T *old_data = data ();
 
-  rep = new Array<T>::ArrayRep (get_size (dims));
+  rep = new typename Array<T>::ArrayRep (get_size (dims));
 
   Array<int> old_dimensions = dimensions;
 
@@ -287,7 +287,7 @@
 
   int len = get_size (dims);
 
-  rep = new Array<T>::ArrayRep (len);
+  rep = new typename Array<T>::ArrayRep (len);
 
   Array<int> old_dimensions = dimensions;
 
--- a/liboctave/ChangeLog	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/ChangeLog	Sat Aug 17 23:00:01 2002 +0000
@@ -1,7 +1,7 @@
 2002-08-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
-	* Array2-idx.h, DiagArray2.cc, Array2.cc, Array3.cc, ArrayN.cc:
-	Try to avoid implicit typename warnings from g++-3.2.
+	* Array.h, Array2-idx.h, DiagArray2.cc, Array2.cc, Array3.cc,
+	ArrayN.cc: Add typename where needed.
 
 	* DASPK.cc: Include lo-sstream.h and use macros instead of using
 	strstream classes directly.
--- a/liboctave/DiagArray2.cc	Sat Aug 17 22:33:05 2002 +0000
+++ b/liboctave/DiagArray2.cc	Sat Aug 17 23:00:01 2002 +0000
@@ -140,7 +140,7 @@
 
   int new_len = r < c ? r : c;
 
-  rep = new Array<T>::ArrayRep (new_len);
+  rep = new typename Array<T>::ArrayRep (new_len);
 
   nr = r;
   nc = c;
@@ -176,7 +176,7 @@
 
   int new_len = r < c ? r : c;
 
-  rep = new Array<T>::ArrayRep (new_len);
+  rep = new typename Array<T>::ArrayRep (new_len);
 
   nr = r;
   nc = c;