Changeset 32248f in git for factory/libfac

Timestamp:

Feb 13, 2012, 7:07:17 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

5b3e93defcacc9bde8afa447cca19e1f795204fc

Parents:

e65b1a45b354104a0af36d13f01356b8fd81f012

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-13 19:07:17+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-13 19:36:36+01:00

Message:

removed duplicating template instantiations from factory/libfac/factor/tmpl_inst.cc

FIX: same template instantiations in factory/libfac/factor/tmpl_inst.cc and factory/ftmpl_inst.cc
CHG: one should not include "factory.h/factoryconf.h" within internal factory code

File:

• factory/libfac/factor/tmpl_inst.cc (modified) (4 diffs)

factory/libfac/factor/tmpl_inst.cc

@@ -4 +4 @@
 ////////////////////////////////////////////////////////////
 
-// #include <factory/templates/ftmpl_array.cc>
+#include "config.h"
 
-#include "factory.h"
+// #include <factory/factoryconf.h>
+
+// #include "factory.h"
+#include "cf_iter.h"
+#include "canonicalform.h"
+#include "cf_assert.h"
+#include "cf_reval.h"
 
 #include "templates/ftmpl_array.cc"
@@ -13 +19 @@
 #include "templates/ftmpl_functions.h"
 #include "templates/ftmpl_matrix.cc"
-
-template class Factor<CanonicalForm>;
-template class List<CFFactor>;
-template class ListIterator<CFFactor>;
-template class List<CanonicalForm>;
-template class ListIterator<CanonicalForm>;
-template class Array<CanonicalForm>;
-template class List<MapPair>;
-template class ListIterator<MapPair>;
-template class Matrix<CanonicalForm>;
-template class SubMatrix<CanonicalForm>;
-
-#ifndef NOSTREAMIO
-template OSTREAM & operator << ( OSTREAM &, const List<CanonicalForm> & );
-template OSTREAM & operator << ( OSTREAM &, const List<CFFactor> & );
-template OSTREAM & operator << ( OSTREAM &, const List<MapPair> & );
-template OSTREAM & operator << ( OSTREAM &, const Array<CanonicalForm> & );
-template OSTREAM & operator << ( OSTREAM &, const Factor<CanonicalForm> & );
-//template OSTREAM & operator << ( OSTREAM &, const Matrix<CanonicalForm> & );
-#endif
-
-template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
-
-/*
-template CanonicalForm crossprod ( const Array<CanonicalForm>&, const Array<CanonicalForm>& );
-template CanonicalForm prod ( const Array<CanonicalForm>& );
-*/
-
-template CanonicalForm tmax ( const CanonicalForm&, const CanonicalForm& );
-template CanonicalForm tmin ( const CanonicalForm&, const CanonicalForm& );
-
-template int tmax ( const int&, const int& );
-template int tmin ( const int&, const int& );
 
 // place here your own template stuff, not instantiated by factory
@@ -60 +33 @@
 template class List<SForm>;
 template class ListIterator<SForm>;
-
-template List<CanonicalForm> Union ( const List<CanonicalForm>&, const List<CanonicalForm>& );
-template List<CanonicalForm> Difference ( const List<CanonicalForm>&, const List<CanonicalForm>& );
 
 #ifndef NOSTREAMIO
@@ -86 +56 @@
 template class Array<int>;
 template class Array<Variable>;
-template class Array<REvaluation>;
 
 // for database