# HG changeset patch
# User jwe
# Date 1029635819 0
# Node ID 7690958e772646c3fd9e901ee8f925df9f944aa9
# Parent  ac132116db8697725e034e8b066215f2337f4183
[project @ 2002-08-18 01:56:58 by jwe]

diff -r ac132116db86 -r 7690958e7726 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Sat Aug 17 23:00:01 2002 +0000
+++ b/liboctave/ChangeLog	Sun Aug 18 01:56:59 2002 +0000
@@ -1,3 +1,8 @@
+2002-08-17  Mumit Khan  <khan@nanotech.wisc.edu>
+
+	* CmplxCHOL.h, CollocWt.h, cmd-edit.h, oct-shlib.h: Don't use
+	qualified names.
+
 2002-08-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Array.h, Array2-idx.h, DiagArray2.cc, Array2.cc, Array3.cc,
diff -r ac132116db86 -r 7690958e7726 liboctave/CmplxCHOL.h
--- a/liboctave/CmplxCHOL.h	Sat Aug 17 23:00:01 2002 +0000
+++ b/liboctave/CmplxCHOL.h	Sun Aug 18 01:56:59 2002 +0000
@@ -38,17 +38,17 @@
 
   ComplexCHOL (void) : chol_mat () { }
 
-  ComplexCHOL::ComplexCHOL (const ComplexMatrix& a) { init (a); }
+  ComplexCHOL (const ComplexMatrix& a) { init (a); }
 
-  ComplexCHOL::ComplexCHOL (const ComplexMatrix& a, int& info)
+  ComplexCHOL (const ComplexMatrix& a, int& info)
     {
       info = init (a);
     }
 
-  ComplexCHOL::ComplexCHOL (const ComplexCHOL& a)
+  ComplexCHOL (const ComplexCHOL& a)
     : chol_mat (a.chol_mat) { }
 
-  ComplexCHOL& ComplexCHOL::operator = (const ComplexCHOL& a)
+  ComplexCHOL& operator = (const ComplexCHOL& a)
     {
       if (this != &a)
 	chol_mat = a.chol_mat;
@@ -56,7 +56,7 @@
       return *this;
     }
 
-  ComplexMatrix ComplexCHOL::chol_matrix (void) const
+  ComplexMatrix chol_matrix (void) const
     {
       return chol_mat;
     }
diff -r ac132116db86 -r 7690958e7726 liboctave/CollocWt.h
--- a/liboctave/CollocWt.h	Sat Aug 17 23:00:01 2002 +0000
+++ b/liboctave/CollocWt.h	Sun Aug 18 01:56:59 2002 +0000
@@ -37,35 +37,34 @@
 {
 public:
 
-  CollocWt::CollocWt (void)
+  CollocWt (void)
     : n (0), inc_left (0), inc_right (0), lb (0.0), rb (1.0),
       Alpha (0.0), Beta (0.0), r (), q (), A (), B (), initialized (0) { }
 
-  CollocWt::CollocWt (int nc, int il, int ir)
+  CollocWt (int nc, int il, int ir)
     : n (nc), inc_left (il), inc_right (ir), lb (0.0), rb (1.0),
       Alpha (0.0), Beta (0.0), r (), q (), A (), B (), initialized (0) { }
 
-  CollocWt::CollocWt (int nc, int il, int ir, double l, double r)
+  CollocWt (int nc, int il, int ir, double l, double r)
     : n (nc), inc_left (il), inc_right (ir), lb (l), rb (r),
       Alpha (0.0), Beta (0.0), r (), q (), A (), B (), initialized (0) { }
 
-  CollocWt::CollocWt (int nc, double a, double b, int il, int ir)
+  CollocWt (int nc, double a, double b, int il, int ir)
     : n (nc), inc_left (il), inc_right (ir), lb (0.0), rb (1.0),
       Alpha (a), Beta (b), initialized (0) { }
 
-  CollocWt::CollocWt (int nc, double a, double b, int il, int ir,
+  CollocWt (int nc, double a, double b, int il, int ir,
 		      double l, double r)  
     : n (nc), inc_left (il), inc_right (ir), lb (l), rb (r),
       Alpha (a), Beta (b), r (), q (), A (), B (), initialized (0) { }
 
-  CollocWt::CollocWt (const CollocWt& a)
+  CollocWt (const CollocWt& a)
     : n (a.n), inc_left (a.inc_left), inc_right (a.inc_right),
       lb (a.lb), rb (a.rb), Alpha (a.Alpha), Beta (a.Beta),
       r (a.r), q (a.q), A (a.A), B (a.B),
       initialized (a.initialized) { } 
 
-  CollocWt&
-  CollocWt::operator = (const CollocWt& a)
+  CollocWt& operator = (const CollocWt& a)
     {
       if (this != &a)
 	{
diff -r ac132116db86 -r 7690958e7726 liboctave/cmd-edit.h
--- a/liboctave/cmd-edit.h	Sat Aug 17 23:00:01 2002 +0000
+++ b/liboctave/cmd-edit.h	Sun Aug 18 01:56:59 2002 +0000
@@ -73,11 +73,9 @@
 
   static void blink_matching_paren (bool flag);
 
-  static void command_editor::set_basic_word_break_characters
-    (const std::string& s);
+  static void set_basic_word_break_characters (const std::string& s);
 
-  static void command_editor::set_completer_word_break_characters
-    (const std::string& s);
+  static void set_completer_word_break_characters (const std::string& s);
 
   static void set_basic_quote_characters (const std::string& s);
 
diff -r ac132116db86 -r 7690958e7726 liboctave/oct-shlib.h
--- a/liboctave/oct-shlib.h	Sat Aug 17 23:00:01 2002 +0000
+++ b/liboctave/oct-shlib.h	Sun Aug 18 01:56:59 2002 +0000
@@ -49,7 +49,7 @@
 
   octave_shlib (void) : rep (make_shlib ()) { }
 
-  octave_shlib::octave_shlib (const std::string& f, bool warn_future)
+  octave_shlib (const std::string& f, bool warn_future)
     : rep (make_shlib ())
   {
     open (f, warn_future);
diff -r ac132116db86 -r 7690958e7726 src/Cell.h
--- a/src/Cell.h	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/Cell.h	Sun Aug 18 01:56:59 2002 +0000
@@ -33,7 +33,7 @@
 #include "oct-alloc.h"
 #include "str-vec.h"
 
-#include "ov.h"
+#include "oct-obj.h"
 
 class
 Cell : public Array2<octave_value>
diff -r ac132116db86 -r 7690958e7726 src/ChangeLog
--- a/src/ChangeLog	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/ChangeLog	Sun Aug 18 01:56:59 2002 +0000
@@ -1,3 +1,28 @@
+2002-08-17  Mumit Khan  <khan@nanotech.wisc.edu>
+
+	* c-file-ptr-stream.h (c_file_ptr_buf::c_file_ptr_buf): Add Intel
+	C++ runtime support.
+
+	* Cell.h, gripes.cc, ov-base-scalar.cc, ov-colon.cc, ov-fcn.cc,
+	ov-file.cc, ov-mapper.h, ov-va-args.cc, token.cc, xpow.cc,
+	OPERATORS/op-b-b.cc, OPERATORS/op-bm-b.cc, OPERATORS/op-bm-bm.cc,
+	OPERATORS/op-cell.cc, OPERATORS/op-chm.cc, OPERATORS/op-cm-cm.cc,
+	OPERATORS/op-cm-cs.cc, OPERATORS/op-cm-m.cc, OPERATORS/op-cm-s.cc,
+	OPERATORS/op-cs-cm.cc, OPERATORS/op-cs-cs.cc, OPERATORS/op-cs-m.cc,
+	OPERATORS/op-cs-s.cc, OPERATORS/op-fil-b.cc, OPERATORS/op-fil-bm.cc,
+	OPERATORS/op-fil-cm.cc, OPERATORS/op-fil-cs.cc,
+	OPERATORS/op-fil-lis.cc, OPERATORS/op-fil-m.cc,
+	OPERATORS/op-fil-rec.cc, OPERATORS/op-fil-s.cc,
+	OPERATORS/op-fil-str.cc, OPERATORS/op-list.cc, OPERATORS/op-m-cm.cc,
+	OPERATORS/op-m-cs.cc, OPERATORS/op-m-m.cc, OPERATORS/op-m-s.cc,
+	OPERATORS/op-range.cc, OPERATORS/op-s-cm.cc, OPERATORS/op-s-cs.cc,
+	OPERATORS/op-s-m.cc, OPERATORS/op-s-s.cc, OPERATORS/op-str-str.cc,
+	TEMPLATE-INST/Array-sym.cc, TEMPLATE-INST/Array-tc.cc,
+	TEMPLATE-INST/Map-tc.cc, TEMPLATE-INST/SLList-expr.cc,
+	TEMPLATE-INST/SLList-tc.cc, TEMPLATE-INST/SLList-tm.cc,
+	TEMPLATE-INST/SLStack-sym.cc: Make the implementation of
+	octave_value_list visibile for template instantiation.
+
 2002-08-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* DLD-FUNCTIONS/dasrt.cc: Include <iostream> not <iostream.h>.
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-b-b.cc
--- a/src/OPERATORS/op-b-b.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-b-b.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-bool.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-bm-b.cc
--- a/src/OPERATORS/op-bm-b.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-bm-b.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-bool.h"
 #include "ov-bool-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-bm-bm.cc
--- a/src/OPERATORS/op-bm-bm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-bm-bm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-bool-mat.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cell.cc
--- a/src/OPERATORS/op-cell.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cell.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-cell.h"
 #include "ov-scalar.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-chm.cc
--- a/src/OPERATORS/op-chm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-chm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-ch-mat.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cm-cm.cc
--- a/src/OPERATORS/op-cm-cm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cm-cm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-cx-mat.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cm-cs.cc
--- a/src/OPERATORS/op-cm-cs.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cm-cs.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-cx-mat.h"
 #include "ov-complex.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cm-m.cc
--- a/src/OPERATORS/op-cm-m.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cm-m.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -32,6 +32,7 @@
 #include "mx-m-cm.h"
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-cx-mat.h"
 #include "ov-re-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cm-s.cc
--- a/src/OPERATORS/op-cm-s.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cm-s.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -31,6 +31,7 @@
 #include "mx-cm-s.h"
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-cx-mat.h"
 #include "ov-re-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cs-cm.cc
--- a/src/OPERATORS/op-cs-cm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cs-cm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-complex.h"
 #include "ov-cx-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cs-cs.cc
--- a/src/OPERATORS/op-cs-cs.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cs-cs.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-complex.h"
 #include "ov-cx-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cs-m.cc
--- a/src/OPERATORS/op-cs-m.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cs-m.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -32,6 +32,7 @@
 #include "mx-m-cs.h"
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-complex.h"
 #include "ov-cx-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-cs-s.cc
--- a/src/OPERATORS/op-cs-s.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-cs-s.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-complex.h"
 #include "ov-cx-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-b.cc
--- a/src/OPERATORS/op-fil-b.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-b.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-bm.cc
--- a/src/OPERATORS/op-fil-bm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-bm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-cm.cc
--- a/src/OPERATORS/op-fil-cm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-cm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-cs.cc
--- a/src/OPERATORS/op-fil-cs.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-cs.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-lis.cc
--- a/src/OPERATORS/op-fil-lis.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-lis.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-m.cc
--- a/src/OPERATORS/op-fil-m.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-m.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-rec.cc
--- a/src/OPERATORS/op-fil-rec.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-rec.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-s.cc
--- a/src/OPERATORS/op-fil-s.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-s.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-fil-str.cc
--- a/src/OPERATORS/op-fil-str.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-fil-str.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -33,6 +33,7 @@
 #include "mach-info.h"
 
 #include "error.h"
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-list.cc
--- a/src/OPERATORS/op-list.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-list.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-list.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-m-cm.cc
--- a/src/OPERATORS/op-m-cm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-m-cm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -32,6 +32,7 @@
 #include "mx-cm-m.h"
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-re-mat.h"
 #include "ov-cx-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-m-cs.cc
--- a/src/OPERATORS/op-m-cs.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-m-cs.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -32,6 +32,7 @@
 #include "mx-cs-m.h"
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-re-mat.h"
 #include "ov-cx-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-m-m.cc
--- a/src/OPERATORS/op-m-m.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-m-m.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-re-mat.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-m-s.cc
--- a/src/OPERATORS/op-m-s.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-m-s.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-re-mat.h"
 #include "ov-scalar.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-range.cc
--- a/src/OPERATORS/op-range.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-range.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-range.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-s-cm.cc
--- a/src/OPERATORS/op-s-cm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-s-cm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -32,6 +32,7 @@
 #include "mx-cm-s.h"
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-scalar.h"
 #include "ov-cx-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-s-cs.cc
--- a/src/OPERATORS/op-s-cs.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-s-cs.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-scalar.h"
 #include "ov-complex.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-s-m.cc
--- a/src/OPERATORS/op-s-m.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-s-m.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-scalar.h"
 #include "ov-re-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-s-s.cc
--- a/src/OPERATORS/op-s-s.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-s-s.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-scalar.h"
 #include "ov-re-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/OPERATORS/op-str-str.cc
--- a/src/OPERATORS/op-str-str.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/OPERATORS/op-str-str.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "gripes.h"
+#include "oct-obj.h"
 #include "ov.h"
 #include "ov-str-mat.h"
 #include "ov-typeinfo.h"
diff -r ac132116db86 -r 7690958e7726 src/TEMPLATE-INST/Array-sym.cc
--- a/src/TEMPLATE-INST/Array-sym.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/TEMPLATE-INST/Array-sym.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #include "Array.h"
 #include "Array.cc"
 
+#include "oct-obj.h"
 #include "symtab.h"
 
 template class Array<symbol_record *>;
diff -r ac132116db86 -r 7690958e7726 src/TEMPLATE-INST/Array-tc.cc
--- a/src/TEMPLATE-INST/Array-tc.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/TEMPLATE-INST/Array-tc.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -35,7 +35,7 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
-#include "ov.h"
+#include "oct-obj.h"
 
 template class Array<octave_value>;
 
diff -r ac132116db86 -r 7690958e7726 src/TEMPLATE-INST/Map-tc.cc
--- a/src/TEMPLATE-INST/Map-tc.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/TEMPLATE-INST/Map-tc.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,7 +29,7 @@
 #include "Map.h"
 #include "Map.cc"
 
-#include "ov.h"
+#include "oct-obj.h"
 
 template class Map<octave_value>;
 template class CHNode<octave_value>;
diff -r ac132116db86 -r 7690958e7726 src/TEMPLATE-INST/SLList-expr.cc
--- a/src/TEMPLATE-INST/SLList-expr.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/TEMPLATE-INST/SLList-expr.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,7 +29,7 @@
 #include "SLList.h"
 #include "SLList.cc"
 
-#include "ov.h"
+#include "oct-obj.h"
 #include "pt-exp.h"
 #include "pt-id.h"
 #include "pt-idx.h"
diff -r ac132116db86 -r 7690958e7726 src/TEMPLATE-INST/SLList-tc.cc
--- a/src/TEMPLATE-INST/SLList-tc.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/TEMPLATE-INST/SLList-tc.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,7 +29,7 @@
 #include "SLList.h"
 #include "SLList.cc"
 
-#include "ov.h"
+#include "oct-obj.h"
 
 template class SLNode<octave_value>;
 template class SLList<octave_value>;
diff -r ac132116db86 -r 7690958e7726 src/TEMPLATE-INST/SLList-tm.cc
--- a/src/TEMPLATE-INST/SLList-tm.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/TEMPLATE-INST/SLList-tm.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,7 +29,7 @@
 #include "SLList.h"
 #include "SLList.cc"
 
-#include "ov.h"
+#include "oct-obj.h"
 #include "pt-mat.h"
 
 template class SLNode<tree_matrix *>;
diff -r ac132116db86 -r 7690958e7726 src/TEMPLATE-INST/SLStack-sym.cc
--- a/src/TEMPLATE-INST/SLStack-sym.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/TEMPLATE-INST/SLStack-sym.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -35,6 +35,7 @@
 #include "SLStack.h"
 #include "SLStack.cc"
 
+#include "oct-obj.h"
 #include "symtab.h"
 
 template class SLNode<symbol_record::symbol_def *>;
diff -r ac132116db86 -r 7690958e7726 src/c-file-ptr-stream.h
--- a/src/c-file-ptr-stream.h	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/c-file-ptr-stream.h	Sun Aug 18 01:56:59 2002 +0000
@@ -72,6 +72,8 @@
     : 
 #if defined __GNUC__ && __GNUC__ >= 3
     OCTAVE_STD_FILEBUF (f_arg, std::ios::in | std::ios::out),
+#elif defined __INTEL_COMPILER
+    OCTAVE_STD_FILEBUF (f_arg),
 #else
     OCTAVE_STD_FILEBUF (f_arg ? fileno (f_arg) : -1),
 #endif
diff -r ac132116db86 -r 7690958e7726 src/gripes.cc
--- a/src/gripes.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/gripes.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -26,7 +26,7 @@
 
 #include "error.h"
 #include "gripes.h"
-#include "ov.h"
+#include "oct-obj.h"
 
 void
 gripe_not_supported (const char *fcn)
diff -r ac132116db86 -r 7690958e7726 src/ov-base-scalar.cc
--- a/src/ov-base-scalar.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/ov-base-scalar.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -30,6 +30,7 @@
 
 #include <iostream>
 
+#include "oct-obj.h"
 #include "ov-base.h"
 #include "ov-cx-mat.h"
 #include "ov-re-mat.h"
diff -r ac132116db86 -r 7690958e7726 src/ov-colon.cc
--- a/src/ov-colon.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/ov-colon.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -32,6 +32,7 @@
 
 #include "error.h"
 #include "pr-output.h"
+#include "oct-obj.h"
 #include "ov-colon.h"
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_magic_colon, "magic-colon");
diff -r ac132116db86 -r 7690958e7726 src/ov-fcn.cc
--- a/src/ov-fcn.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/ov-fcn.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "error.h"
+#include "oct-obj.h"
 #include "ov-fcn.h"
 
 DEFINE_OCTAVE_ALLOCATOR (octave_function);
diff -r ac132116db86 -r 7690958e7726 src/ov-file.cc
--- a/src/ov-file.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/ov-file.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -30,6 +30,7 @@
 
 #include <iostream>
 
+#include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
 #include "ov-file.h"
diff -r ac132116db86 -r 7690958e7726 src/ov-mapper.h
--- a/src/ov-mapper.h	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/ov-mapper.h	Sun Aug 18 01:56:59 2002 +0000
@@ -29,6 +29,7 @@
 
 #include <string>
 
+#include "oct-obj.h"
 #include "ov-fcn.h"
 #include "ov-typeinfo.h"
 
diff -r ac132116db86 -r 7690958e7726 src/ov-va-args.cc
--- a/src/ov-va-args.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/ov-va-args.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -32,6 +32,7 @@
 
 #include "error.h"
 #include "pr-output.h"
+#include "oct-obj.h"
 #include "ov-va-args.h"
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_all_va_args, "va-arg");
diff -r ac132116db86 -r 7690958e7726 src/token.cc
--- a/src/token.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/token.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -31,7 +31,7 @@
 #include <cassert>
 
 #include "error.h"
-#include "ov.h"
+#include "oct-obj.h"
 #include "symtab.h"
 #include "token.h"
 #include "utils.h"
diff -r ac132116db86 -r 7690958e7726 src/xpow.cc
--- a/src/xpow.cc	Sat Aug 17 23:00:01 2002 +0000
+++ b/src/xpow.cc	Sun Aug 18 01:56:59 2002 +0000
@@ -37,7 +37,7 @@
 #include "oct-cmplx.h"
 
 #include "error.h"
-#include "ov.h"
+#include "oct-obj.h"
 #include "utils.h"
 #include "xpow.h"