[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 976242e2497f046d6dc5ad0f22a0ecfc329c2cdd
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Wed Feb 29 19:48:15 2012 +0100

    fix: rDecompose for order am on 64bit

diff --git a/Singular/ipshell.cc b/Singular/ipshell.cc
index b943e27..6a18d65 100644
--- a/Singular/ipshell.cc
+++ b/Singular/ipshell.cc
@@ -1852,11 +1852,11 @@ lists rDecompose(const ring r)
       if (r->order[i]==ringorder_M)
       {
         j=(j+1)*(j+1)-1;
-	bl=j+1;
+        bl=j+1;
       }
       else if (r->order[i]==ringorder_am)
       {
-        j=omSizeWOfAddr(r->wvhdl[i])-3;
+        j+=r->wvhdl[i][bl+1];
       }
       iv=new intvec(j+1);
       if ((r->wvhdl!=NULL) && (r->wvhdl[i]!=NULL))
@@ -4705,8 +4705,8 @@ BOOLEAN rSleftvOrdering2Ordering(sleftv *ord, ring R)
             R->block0[n] = last+1;
             R->block1[n] = si_min(last+iv->length()-2 , rVar(R));
             R->wvhdl[n] = (int*)omAlloc(iv->length()*sizeof(int));
-	    if (R->block1[n]- R->block0[n]+2>=iv->length())
-	      WarnS("missing module weights");
+            if (R->block1[n]- R->block0[n]+2>=iv->length())
+              WarnS("missing module weights");
             for (i=2; i<=(R->block1[n]-R->block0[n]+2); i++)
             {
               R->wvhdl[n][i-2]=(*iv)[i];

-- 
an open source computer algebra system