--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liboctave/Array-so.cc	Sun Nov 23 19:36:33 2003 +0000
@@ -0,0 +1,47 @@
+/*
+
+Copyright (C) 2003 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+// Instantiate Arrays of std::streamoff values.
+
+#include "Array.h"
+#include "Array.cc"
+
+INSTANTIATE_ARRAY_AND_ASSIGN (std::streamoff);
+
+#include "Array2.h"
+
+template class Array2<std::streamoff>;
+
+#include "ArrayN.h"
+#include "ArrayN.cc"
+
+template class ArrayN<std::streamoff>;
+
+/*
+;;; Local Variables: ***
+;;; mode: C++ ***
+;;; End: ***
+*/

--- a/liboctave/ChangeLog	Sun Nov 23 18:20:12 2003 +0000
+++ b/liboctave/ChangeLog	Sun Nov 23 19:36:33 2003 +0000
@@ -1,5 +1,8 @@
 2003-11-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Array-so.cc: New file.  Move instantiations here from so-array.h.
+	* Makefile.in (TI_SRC): Add it to the list.
+
 	* MArray-defs.h (DO_VS_OP2, DO_VV_OP2): Accept args for element
 	type and the names of the left and right operands.  Change all uses.
 

--- a/liboctave/Makefile.in	Sun Nov 23 18:20:12 2003 +0000
+++ b/liboctave/Makefile.in	Sun Nov 23 19:36:33 2003 +0000
@@ -70,7 +70,7 @@
 	MArray.cc MArray2.cc MArrayN.cc MDiagArray2.cc base-lu.cc
 
 TI_SRC := Array-C.cc Array-b.cc Array-ch.cc Array-i.cc Array-d.cc \
-	Array-s.cc Array-str.cc Array-idx-vec.cc \
+	Array-s.cc Array-so.cc Array-str.cc Array-idx-vec.cc \
 	MArray-C.cc MArray-ch.cc MArray-i.cc MArray-d.cc MArray-s.cc
 
 MATRIX_SRC := Array-flags.cc Array-util.cc CColVector.cc \

--- a/liboctave/so-array.cc	Sun Nov 23 18:20:12 2003 +0000
+++ b/liboctave/so-array.cc	Sun Nov 23 19:36:33 2003 +0000
@@ -30,10 +30,8 @@
 
 #include <iostream>
 
-#include "Array.h"
-#include "Array.cc"
 #include "ArrayN.h"
-#include "ArrayN.cc"
+#include "Array-util.h"
 // XXX FIXME XXX -- we are including the MArray{,2,N}.h files just for
 // their gripe_nonconformant function decls.
 #include "MArray.h"
@@ -45,10 +43,6 @@
 #include "mx-op-defs.h"
 #include "so-array.h"
 
-INSTANTIATE_ARRAY_AND_ASSIGN (std::streamoff);
-
-template class ArrayN<std::streamoff>;
-
 boolNDArray
 streamoff_array::all (int dim) const
 {