Changeset 2983

Timestamp:

07/02/08 06:31:19 (5 months ago)

Author:

dumas

Message:

ported to new g++ way of handling double template class
with defaults

Files:

• trunk/linbox/linbox/algorithms/smith-form-sparseelim-local.h (modified) (2 diffs)

trunk/linbox/linbox/algorithms/smith-form-sparseelim-local.h

@@ -283 +283 @@
 // ------------------------------------------------------
 
-        template<class Modulo, class BB, class D, template<class X> class Container>
-        void gauss_rankin(Modulo FMOD, Modulo PRIME, Container<size_t>& ranks, BB& LigneA, const size_t Ni, const size_t Nj, const D& density_trait) {
+        template<class Modulo, class BB, class D, class Container>
+        void gauss_rankin(Modulo FMOD, Modulo PRIME, Container& ranks, BB& LigneA, const size_t Ni, const size_t Nj, const D& density_trait) {
             ranks.resize(0);
 
@@ -398 +398 @@
         }
 
-        template<class Modulo, class BB, class D, template<class X> class Container>
-        void prime_power_rankin (Modulo FMOD, Modulo PRIME, Container<size_t>& ranks, BB& SLA, const size_t Ni, const size_t Nj, const D& density_trait){
+        template<class Modulo, class BB, class D, class Container>
+        void prime_power_rankin (Modulo FMOD, Modulo PRIME, Container& ranks, BB& SLA, const size_t Ni, const size_t Nj, const D& density_trait){
             gauss_rankin(FMOD,PRIME,ranks, SLA, Ni, Nj, density_trait);
         }
 
-       template<template<class X> class Container, class Matrix>
-       Container<std::pair<size_t,size_t> >& operator()(Container<std::pair<size_t,size_t> >& L, Matrix& A, size_t FMOD, size_t PRIME) { 
-           Container<size_t> ranks;
+
+       template<class Matrix, template<class, class> class Container, template<class> class Alloc>
+       Container<std::pair<size_t,size_t>, Alloc<std::pair<size_t,size_t> > >& operator()(Container<std::pair<size_t,size_t>, Alloc<std::pair<size_t,size_t> > >& L, Matrix& A, size_t FMOD, size_t PRIME) { 
+           Container<size_t, Alloc<size_t> > ranks;
            prime_power_rankin( FMOD, PRIME, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>());
            L.resize( 0 ) ;
            size_t MOD = 1;
            size_t num = 0, diff;
-           for( typename Container<size_t>::const_iterator it = ranks.begin(); it != ranks.end(); ++it) {
+           for( typename Container<size_t, Alloc<size_t> >::const_iterator it = ranks.begin(); it != ranks.end(); ++it) {
                diff = *it-num;
                if (diff > 0)