# HG changeset patch
# User jwe
# Date 1064008465 0
# Node ID 228d2d5b6d6678a8761073979becdf9d2d094f47
# Parent  8373b9b41eee193c7fed62eb28953c4005ca36d8
[project @ 2003-09-19 21:53:15 by jwe]

diff --git a/liboctave/Array-C.cc b/liboctave/Array-C.cc
--- a/liboctave/Array-C.cc
+++ b/liboctave/Array-C.cc
@@ -46,26 +46,9 @@
 template int assign (Array<Complex>&, const Array<char>&, const Complex&);
 
 #include "Array2.h"
-#include "Array2.cc"
 
 template class Array2<Complex>;
 
-#if 0
-
-template int assign (Array2<Complex>&, const Array2<Complex>&);
-template int assign (Array2<Complex>&, const Array2<double>&);
-template int assign (Array2<Complex>&, const Array2<int>&);
-template int assign (Array2<Complex>&, const Array2<short>&);
-template int assign (Array2<Complex>&, const Array2<char>&);
-
-template int assign (Array2<Complex>&, const Array2<Complex>&, const Complex&);
-template int assign (Array2<Complex>&, const Array2<double>&, const Complex&);
-template int assign (Array2<Complex>&, const Array2<int>&, const Complex&);
-template int assign (Array2<Complex>&, const Array2<short>&, const Complex&);
-template int assign (Array2<Complex>&, const Array2<char>&, const Complex&);
-
-#endif
-
 #include "ArrayN.h"
 #include "ArrayN.cc"
 
diff --git a/liboctave/Array-b.cc b/liboctave/Array-b.cc
--- a/liboctave/Array-b.cc
+++ b/liboctave/Array-b.cc
@@ -36,18 +36,9 @@
 template int assign (Array<bool>&, const Array<bool>&, const bool&);
 
 #include "Array2.h"
-#include "Array2.cc"
 
 template class Array2<bool>;
 
-#if 0
-
-template int assign (Array2<bool>&, const Array2<bool>&);
-
-template int assign (Array2<bool>&, const Array2<bool>&, const bool&);
-
-#endif
-
 #include "ArrayN.h"
 #include "ArrayN.cc"
 
diff --git a/liboctave/Array-ch.cc b/liboctave/Array-ch.cc
--- a/liboctave/Array-ch.cc
+++ b/liboctave/Array-ch.cc
@@ -36,18 +36,9 @@
 template int assign (Array<char>&, const Array<char>&, const char&);
 
 #include "Array2.h"
-#include "Array2.cc"
 
 template class Array2<char>;
 
-#if 0
-
-template int assign (Array2<char>&, const Array2<char>&);
-
-template int assign (Array2<char>&, const Array2<char>&, const char&);
-
-#endif
-
 #include "ArrayN.h"
 #include "ArrayN.cc"
 
diff --git a/liboctave/Array-d.cc b/liboctave/Array-d.cc
--- a/liboctave/Array-d.cc
+++ b/liboctave/Array-d.cc
@@ -42,43 +42,14 @@
 template int assign (Array<double>&, const Array<char>&, const double&);
 
 #include "Array2.h"
-#include "Array2.cc"
 
 template class Array2<double>;
 
-#if 0
-
-template int assign (Array2<double>&, const Array2<double>&);
-template int assign (Array2<double>&, const Array2<int>&);
-template int assign (Array2<double>&, const Array2<short>&);
-template int assign (Array2<double>&, const Array2<char>&);
-
-template int assign (Array2<double>&, const Array2<double>&, const double&);
-template int assign (Array2<double>&, const Array2<int>&, const double&);
-template int assign (Array2<double>&, const Array2<short>&, const double&);
-template int assign (Array2<double>&, const Array2<char>&, const double&);
-
-#endif
-
 #include "ArrayN.h"
 #include "ArrayN.cc"
 
 template class ArrayN<double>;
 
-#if 0
-
-template int assign (ArrayN<double>&, const ArrayN<double>&);
-template int assign (ArrayN<double>&, const ArrayN<int>&);
-template int assign (ArrayN<double>&, const ArrayN<short>&);
-template int assign (ArrayN<double>&, const ArrayN<char>&);
-
-template int assign (ArrayN<double>&, const ArrayN<double>&, const double&);
-template int assign (ArrayN<double>&, const ArrayN<int>&, const double&);
-template int assign (ArrayN<double>&, const ArrayN<short>&, const double&);
-template int assign (ArrayN<double>&, const ArrayN<char>&, const double&);
-
-#endif
-
 template std::ostream& operator << (std::ostream&, const ArrayN<double>&);
 
 #include "DiagArray2.h"
diff --git a/liboctave/Array-i.cc b/liboctave/Array-i.cc
--- a/liboctave/Array-i.cc
+++ b/liboctave/Array-i.cc
@@ -40,22 +40,9 @@
 template int assign (Array<int>&, const Array<char>&, const int&);
 
 #include "Array2.h"
-#include "Array2.cc"
 
 template class Array2<int>;
 
-#if 0
-
-template int assign (Array2<int>&, const Array2<int>&);
-template int assign (Array2<int>&, const Array2<short>&);
-template int assign (Array2<int>&, const Array2<char>&);
-
-template int assign (Array2<int>&, const Array2<int>&, const int&);
-template int assign (Array2<int>&, const Array2<short>&, const int&);
-template int assign (Array2<int>&, const Array2<char>&, const int&);
-
-#endif
-
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
diff --git a/liboctave/Array-s.cc b/liboctave/Array-s.cc
--- a/liboctave/Array-s.cc
+++ b/liboctave/Array-s.cc
@@ -38,20 +38,9 @@
 template int assign (Array<short>&, const Array<char>&, const short&);
 
 #include "Array2.h"
-#include "Array2.cc"
 
 template class Array2<short>;
 
-#if 0
-
-template int assign (Array2<short>&, const Array2<short>&);
-template int assign (Array2<short>&, const Array2<char>&);
-
-template int assign (Array2<short>&, const Array2<short>&, const short&);
-template int assign (Array2<short>&, const Array2<char>&, const short&);
-
-#endif
-
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
diff --git a/src/TEMPLATE-INST/Array-tc.cc b/src/TEMPLATE-INST/Array-tc.cc
--- a/src/TEMPLATE-INST/Array-tc.cc
+++ b/src/TEMPLATE-INST/Array-tc.cc
@@ -32,7 +32,6 @@
 #include "Array.cc"
 
 #include "Array2.h"
-#include "Array2.cc"
 
 #include "ArrayN.h"
 #include "ArrayN.cc"
@@ -60,15 +59,6 @@
 
 template class Array2<octave_value>;
 
-#if 0
-
-template int assign (Array2<octave_value>&, const Array2<octave_value>&);
-
-template int assign (Array2<octave_value>&,
-		     const Array2<octave_value>&, const octave_value&);
-
-#endif
-
 template class ArrayN<octave_value>;
 
 /*
diff --git a/src/ov-typeinfo.cc b/src/ov-typeinfo.cc
--- a/src/ov-typeinfo.cc
+++ b/src/ov-typeinfo.cc
@@ -40,9 +40,11 @@
 octave_value_typeinfo *
 octave_value_typeinfo::instance (0);
 
+#include <Array.h>
+#include <Array2.h>
+#include <Array3.h>
+
 #include <Array.cc>
-#include <Array2.cc>
-#include <Array3.cc>
 
 template class Array<unary_op_fcn>;
 template class Array2<unary_op_fcn>;