changeset 352:ff237c5f5002

[project @ 1994-02-10 23:35:14 by jwe]
author jwe
date Thu, 10 Feb 1994 23:35:27 +0000
parents aaf43fb91f39
children bd4696024bda
files liboctave/Array.cc liboctave/Array.h
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array.cc	Thu Feb 10 08:55:38 1994 +0000
+++ b/liboctave/Array.cc	Thu Feb 10 23:35:27 1994 +0000
@@ -32,7 +32,6 @@
 #endif
 
 #include "Array.h"
-#include "lo-error.h"
 
 /*
  * The real representation of all arrays.
--- a/liboctave/Array.h	Thu Feb 10 08:55:38 1994 +0000
+++ b/liboctave/Array.h	Thu Feb 10 23:35:27 1994 +0000
@@ -28,6 +28,8 @@
 #pragma interface
 #endif
 
+#include "lo-error.h"
+
 // Classes we declare.
 
 template <class T> class ArrayRep;
@@ -310,12 +312,12 @@
   T& checkelem (int r, int c);
   T& operator () (int r, int c);
 #else
-  Proxy elem (int r, int c)
+  inline Proxy elem (int r, int c)
   {
     return Proxy (this, r, c);
   }
 
-  Proxy checkelem (int r, int c)
+  inline Proxy checkelem (int r, int c)
   {
     if (r < 0 || c < 0 || r >= nr || c >= nc)
       {
@@ -326,7 +328,7 @@
       return Proxy (this, r, c);
   }
 
-  Proxy operator () (int r, int c)
+  inline Proxy operator () (int r, int c)
   {
     if (r < 0 || c < 0 || r >= nr || c >= nc)
       {
@@ -350,8 +352,8 @@
 
 private:
 
-  T get (int i) { return Array<T>::elem (i); }
-  void set (const T& val, int i) { Array<T>::elem (i) = val; }
+  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 (__GNUG__) && ! defined (USE_EXTERNAL_TEMPLATES)