bicatali 14/03/11 19:07:23 Added: singular-3.1.6-ntl6compat.patch singular-3.1.6-factory_template_instantiation.patch Log: Version bump adapted from sage-on-gentoo (Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path 1.1 sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch?rev=1.1&content-type=text/plain Index: singular-3.1.6-ntl6compat.patch =================================================================== diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc index 0fa6109..553afa5 100644 Index: Singular/claptmpl.cc =================================================================== --- a/Singular/claptmpl.cc +++ b/Singular/claptmpl.cc @@ -123,3 +123,36 @@ template class std::list<PolyMinorValue>; template class Cache<MinorKey, IntMinorValue>; template class Cache<MinorKey, PolyMinorValue>; +#ifdef HAVE_NTL +#include<NTL/version.h> +#if NTL_MAJOR_VERSION == 6 + +#include<NTL/tools.h> +#include<NTL/lzz_pE.h> +#include<NTL/lzz_pEX.h> +#include<NTL/lzz_p.h> +#include<NTL/vector.h> +#include<NTL/pair.h> +#include<NTL/GF2X.h> +#include<NTL/GF2EX.h> +#include<NTL/ZZ.h> +#include<NTL/ZZX.h> +#include<NTL/ZZ_pX.h> +#ifdef NTL_CLIENT // in <NTL/tools.h>: using of name space NTL +NTL_CLIENT +#endif +template class Vec<zz_p>; +template class Vec<zz_pE>; +template class Mat<zz_p>; +template class Mat<zz_pE>; +template class Mat<ZZ>; +template class Vec<Pair<zz_pEX, long> >; +template class Vec<Pair<GF2EX, long> >; +template class Vec<Pair<ZZX, long> >; +template class Vec<Pair<ZZ_pX, long> >; +template class Vec<Pair<GF2X, long> >; +template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&); +template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&); +#endif + +#endif 1.1 sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch?rev=1.1&content-type=text/plain Index: singular-3.1.6-factory_template_instantiation.patch =================================================================== diff --git a/libfac/factor/tmpl_inst.cc b/libfac/factor/tmpl_inst.cc index bda287a..2f5ba49 100644 Index: libfac/factor/tmpl_inst.cc =================================================================== --- a/libfac/factor/tmpl_inst.cc +++ b/libfac/factor/tmpl_inst.cc @@ -3,7 +3,7 @@ //////////////////////////////////////////////////////////// -//#include <templates/ftmpl_array.cc> +#include <factory/templates/ftmpl_array.cc> //#include <templates/ftmpl_factor.cc> #include <templates/ftmpl_list.h> #include <factory/templates/ftmpl_list.cc> @@ -75,8 +75,8 @@ template OSTREAM & operator << ( OSTREAM &, const List<Variable> & ); template OSTREAM & operator << ( OSTREAM &, const Array<int> & ); #endif -template class Array<int>; -template class Array<Variable>; +//template class Array<int>; +//template class Array<Variable>; //template class Array<REvaluation>; // for database