Mercurial > octave-nkf
changeset 4053:1fb249b4d1bb
[project @ 2002-08-17 22:33:05 by jwe]
| author | jwe |
|---|---|
| date | Sat, 17 Aug 2002 22:33:05 +0000 |
| parents | c2562b2593e2 |
| children | ac132116db86 |
| files | liboctave/Array2-idx.h liboctave/Array2.cc liboctave/Array3.cc liboctave/ArrayN.cc liboctave/ChangeLog liboctave/DiagArray2.cc |
| diffstat | 6 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array2-idx.h Sat Aug 17 22:15:13 2002 +0000 +++ b/liboctave/Array2-idx.h Sat Aug 17 22:33:05 2002 +0000 @@ -281,7 +281,7 @@ if (--rep->count <= 0) delete rep; - rep = new ArrayRep (new_data, new_n); + rep = new Array<T>::ArrayRep (new_data, new_n); if (nr == 1) { @@ -395,7 +395,7 @@ if (--rep->count <= 0) delete rep; - rep = new ArrayRep (new_data, nr * new_nc); + rep = new Array<T>::ArrayRep (new_data, nr * new_nc); d2 = new_nc; @@ -459,7 +459,7 @@ if (--rep->count <= 0) delete rep; - rep = new ArrayRep (new_data, new_nr * nc); + rep = new Array<T>::ArrayRep (new_data, new_nr * nc); d1 = new_nr;
--- a/liboctave/Array2.cc Sat Aug 17 22:15:13 2002 +0000 +++ b/liboctave/Array2.cc Sat Aug 17 22:33:05 2002 +0000 @@ -122,7 +122,7 @@ if (r == dim1 () && c == dim2 ()) return; - Array<T>::ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); int old_d1 = dim1 (); @@ -162,7 +162,7 @@ if (r == dim1 () && c == dim2 ()) return; - Array<T>::ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); int old_d1 = dim1 ();
--- a/liboctave/Array3.cc Sat Aug 17 22:15:13 2002 +0000 +++ b/liboctave/Array3.cc Sat Aug 17 22:33:05 2002 +0000 @@ -58,7 +58,7 @@ if (r == dim1 () && c == dim2 () && p == dim3 ()) return; - ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); int old_d1 = dim1 (); @@ -68,7 +68,7 @@ int ts = get_size (get_size (r, c), p); - rep = new ArrayRep (ts); + rep = new Array<T>::ArrayRep (ts); d1 = r; d2 = c; @@ -104,7 +104,7 @@ if (r == dim1 () && c == dim2 () && p == dim3 ()) return; - ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); int old_d1 = dim1 (); @@ -115,7 +115,7 @@ int ts = get_size (get_size (r, c), p); - rep = new ArrayRep (ts); + rep = new Array<T>::ArrayRep (ts); d1 = r; d2 = c;
--- a/liboctave/ArrayN.cc Sat Aug 17 22:15:13 2002 +0000 +++ b/liboctave/ArrayN.cc Sat Aug 17 22:33:05 2002 +0000 @@ -227,7 +227,7 @@ if (no_change) return; - Array<T>::ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); rep = new Array<T>::ArrayRep (get_size (dims)); @@ -282,7 +282,7 @@ if (no_change) return; - Array<T>::ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); int len = get_size (dims);
--- a/liboctave/ChangeLog Sat Aug 17 22:15:13 2002 +0000 +++ b/liboctave/ChangeLog Sat Aug 17 22:33:05 2002 +0000 @@ -1,5 +1,8 @@ 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. + * DASPK.cc: Include lo-sstream.h and use macros instead of using strstream classes directly. * DASRT.cc: Likewise.
--- a/liboctave/DiagArray2.cc Sat Aug 17 22:15:13 2002 +0000 +++ b/liboctave/DiagArray2.cc Sat Aug 17 22:33:05 2002 +0000 @@ -134,13 +134,13 @@ if (r == dim1 () && c == dim2 ()) return; - ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); int old_len = length (); int new_len = r < c ? r : c; - rep = new ArrayRep (new_len); + rep = new Array<T>::ArrayRep (new_len); nr = r; nc = c; @@ -170,13 +170,13 @@ if (r == dim1 () && c == dim2 ()) return; - ArrayRep *old_rep = rep; + typename Array<T>::ArrayRep *old_rep = rep; const T *old_data = data (); int old_len = length (); int new_len = r < c ? r : c; - rep = new ArrayRep (new_len); + rep = new Array<T>::ArrayRep (new_len); nr = r; nc = c;