[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit e777d234067ee301159d4506fe3ce0405cc11c56
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Sat Mar 3 13:15:16 2012 +0100

    fix: removed duplicate template instantiations

diff --git a/libfac/factor/tmpl_inst.cc b/libfac/factor/tmpl_inst.cc
index 1445218..3b38424 100644
--- a/libfac/factor/tmpl_inst.cc
+++ b/libfac/factor/tmpl_inst.cc
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-// $Id$
+// $Id: tmpl_inst.cc 14599 2012-02-17 18:00:31Z motsak $
 ////////////////////////////////////////////////////////////
 
 
@@ -60,8 +60,8 @@ template class Substitution<CanonicalForm>;
 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>& );
+//template List<CanonicalForm> Union ( const List<CanonicalForm>&, const List<CanonicalForm>& );
+//template List<CanonicalForm> Difference ( const List<CanonicalForm>&, const List<CanonicalForm>& );
 
 #ifndef NOSTREAMIO
 template OSTREAM & operator << ( OSTREAM &, const List<int> & );
@@ -85,7 +85,7 @@ template OSTREAM & operator << ( OSTREAM &, const Array<int> & );
 
 template class Array<int>;
 template class Array<Variable>;
-template class Array<REvaluation>;
+//template class Array<REvaluation>;
 
 // for database
 #ifdef HAVE_DATABASE

-- 
an open source computer algebra system