Mercurial > hg > octave-nkf

diff liboctave/Array.h @ 645:21cb3c7dc9e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-08-24 06:19:54 by jwe]
author jwe
date Wed, 24 Aug 1994 06:27:09 +0000
parents ac2509294b09
children fdc889cdfb2e
line wrap: on
line diff
--- a/liboctave/Array.h
+++ b/liboctave/Array.h
@@ -237,13 +237,13 @@
   inline T get (int i) { return Array<T>::elem (i); }
   inline void set (const T& val, int i) { Array<T>::elem (i) = val; }
 
-#if ! defined (_AIX)
+#if ! (defined (_AIX) && defined (__GNUG__) && __GNUC__ > 1 && __GNUC_MINOR__ < 6)
   class Proxy
   {
   public:
 
     inline Proxy (DiagArray<T> *ref, int r, int c)
-      : object (ref), i (r), j (c) { } 
+      : i (r), j (c), object (ref) { } 
 
     inline const Proxy& operator = (const T& val) const
     {
@@ -314,7 +314,7 @@
   int cols (void) const;
   int columns (void) const;
 
-#if defined (_AIX)
+#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);