Mercurial > octave
changeset 880:e0bfbbf20e40
[project @ 1994-11-05 03:34:58 by jwe]
| author | jwe |
|---|---|
| date | Sat, 05 Nov 1994 03:34:58 +0000 |
| parents | e6cb0493ae99 |
| children | 29d190ae3364 |
| files | liboctave/Array.cc liboctave/Array.h |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc Sat Nov 05 03:31:24 1994 +0000 +++ b/liboctave/Array.cc Sat Nov 05 03:34:58 1994 +0000 @@ -846,7 +846,7 @@ return nc; } -#if defined (_AIX) && defined (__GNUG__) && __GNUC__ > 1 && __GNUC_MINOR__ < 6 +#if 1 template <class T> T& DiagArray<T>::elem (int r, int c)
--- a/liboctave/Array.h Sat Nov 05 03:31:24 1994 +0000 +++ b/liboctave/Array.h Sat Nov 05 03:34:58 1994 +0000 @@ -233,6 +233,7 @@ inline T get (int i) { return Array<T>::elem (i); } inline void set (const T& val, int i) { Array<T>::elem (i) = val; } +#if 0 #if ! (defined (_AIX) && defined (__GNUG__) && __GNUC__ > 1 && __GNUC_MINOR__ < 6) class Proxy { @@ -283,6 +284,7 @@ friend class Proxy; #endif +#endif protected: @@ -310,11 +312,7 @@ int cols (void) const; int columns (void) const; -#if defined (_AIX) && defined (__GNUG__) && __GNUC__ > 1 && __GNUC_MINOR__ < 6 - T& elem (int r, int c); - T& checkelem (int r, int c); - T& operator () (int r, int c); -#else +#if 0 inline Proxy elem (int r, int c) { return Proxy (this, r, c); @@ -341,6 +339,10 @@ else return Proxy (this, r, c); } +#else + T& elem (int r, int c); + T& checkelem (int r, int c); + T& operator () (int r, int c); #endif // No checking.