Changeset 611871 in git

Timestamp:

Mar 28, 2011, 1:53:28 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

f97705b0f28d859734876fd55a7115c409a8b5c8

Parents:

a3a116bf31680a590c2cc3c1e27c44b1b4fc7dea

Message:

rename memcpy4 -> memcpy

git-svn-id: file:///usr/local/Singular/svn/trunk@14072 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• longrat.cc (modified) (5 diffs)
• mod2.h.in (modified) (1 diff)
• ring.cc (modified) (6 diffs)
• walkSupport.cc (modified) (2 diffs)
• weight0.c (modified) (3 diffs)

kernel/longrat.cc

@@ -313 +313 @@
   number r=nlRInit(1);
   mpz_set_d(r->z,f);
-  memcpy4(&(r->n),&h1,sizeof(h1));
+  memcpy(&(r->n),&h1,sizeof(h1));
   r->s=0; /* not normalized */
   if(f_sign==-1) r=nlNeg(r);
@@ -420 +420 @@
 //  number r=nlRInit(1);
 //  mpz_set_d(&(r->z),f);
-//  memcpy4(&(r->n),&h1,sizeof(h1));
+//  memcpy(&(r->n),&h1,sizeof(h1));
 //  r->s=0; /* not normalized */
 //  nlNormalize(r);
@@ -435 +435 @@
 //    mpz_setbit(&r->z,f_size*BYTES_PER_MP_LIMB*8-1);
 //    // now r->z has enough space
-//    memcpy4(mpz_limb_d(&r->z),((*f)[0]._mp_d),f_size*BYTES_PER_MP_LIMB);
+//    memcpy(mpz_limb_d(&r->z),((*f)[0]._mp_d),f_size*BYTES_PER_MP_LIMB);
 //    nlNormalize(r);
 //  }
@@ -445 +445 @@
 //      mpz_setbit(&r->z,f_size*BYTES_PER_MP_LIMB*8-1);
 //      // now r->z has enough space
-//      memcpy4(mpz_limb_d(&r->z),((*f)[0]._mp_d),f_size*BYTES_PER_MP_LIMB);
+//      memcpy(mpz_limb_d(&r->z),((*f)[0]._mp_d),f_size*BYTES_PER_MP_LIMB);
 //    }
 //    else /* f_shift < 0 */
@@ -451 +451 @@
 //      mpz_setbit(&r->z,(f_size-f_shift)*BYTES_PER_MP_LIMB*8-1);
 //      // now r->z has enough space
-//      memcpy4(mpz_limb_d(&r->z)-f_shift,((*f)[0]._mp_d),
+//      memcpy(mpz_limb_d(&r->z)-f_shift,((*f)[0]._mp_d),
 //        f_size*BYTES_PER_MP_LIMB);
 //    }

kernel/mod2.h.in

@@ -293 +293 @@
 #define HALT() m2_end(2)
 
-#define memcpy4 memcpy
-
 /* define OLD_RES for res/sres/mres(i,j,k) */
 #undef OLD_RES

kernel/ring.cc

@@ -811 +811 @@
   memset(&tmpR,0,sizeof(tmpR));
   /* check coeff. field =====================================================*/
-  if (rInternalChar(r1)==rInternalChar(r2))
+  if ((rFieldType(r1)==rFieldType(r2))
+  && (rInternalChar(r1)==rInternalChar(r2)))
   {
     tmpR.ch=rInternalChar(r1);
@@ -831 +832 @@
       }
     }
-    else if ((r1->ch==1)||(r1->ch<-1)) /* Q(a),Z/p(a) */
+    else if (rField_is_Extension(r1)) /* Q(a),Z/p(a) */
     {
       if (r1->minpoly!=NULL)
@@ -928 +929 @@
       }
     }
+    #ifdef HAVE_RINGS
+    else if (rField_is_Ring(r1)||rField_is_Ring(r2))
+    {
+      Werror("rSumInternal for rings coeffs");
+      return -1;
+    }
+    #endif
   }
   else /* r1->ch!=r2->ch */
@@ -1530 +1538 @@
   ring res=(ring)omAllocBin(sip_sring_bin);
   memset(res,0,sizeof(ip_sring));
-  //memcpy4(res,r,sizeof(ip_sring));
+  //memcpy(res,r,sizeof(ip_sring));
   //memset: res->idroot=NULL; /* local objects */
   //ideal      minideal;
@@ -1650 +1658 @@
         res->wvhdl[j]=NULL;
     }
-    memcpy4(res->order,r->order,i * sizeof(int));
-    memcpy4(res->block0,r->block0,i * sizeof(int));
-    memcpy4(res->block1,r->block1,i * sizeof(int));
+    memcpy(res->order,r->order,i * sizeof(int));
+    memcpy(res->block0,r->block0,i * sizeof(int));
+    memcpy(res->block1,r->block1,i * sizeof(int));
   }
   //memset: else
@@ -4593 +4601 @@
   new_r->block0   = (int *) omAlloc0(i * sizeof(int));
   new_r->block1   = (int *) omAlloc0(i * sizeof(int));
-  memcpy4(new_r->order,r->order,(i-1) * sizeof(int));
-  memcpy4(new_r->block0,r->block0,(i-1) * sizeof(int));
-  memcpy4(new_r->block1,r->block1,(i-1) * sizeof(int));
+  memcpy(new_r->order,r->order,(i-1) * sizeof(int));
+  memcpy(new_r->block0,r->block0,(i-1) * sizeof(int));
+  memcpy(new_r->block1,r->block1,(i-1) * sizeof(int));
   for (int j=0; j<=last_block; j++)
   {

kernel/walkSupport.cc

@@ -1015 +1015 @@
 //i.e. if old order was O, then the new one will be (A(w),O)
 ///////////////////////////////////////////////////////////////////
-//Uses: omAllocBin,memcpy4,sizeof,nCopy,omStrDup,omMemDup,
+//Uses: omAllocBin,memcpy,sizeof,nCopy,omStrDup,omMemDup,
 //idrCopyR_NoSort
 ///////////////////////////////////////////////////////////////////
@@ -1027 +1027 @@
   ring res=(ring)omAllocBin(sip_sring_bin);
 
-  memcpy4(res,r,sizeof(ip_sring));
+  memcpy(res,r,sizeof(ip_sring));
   res->VarOffset = NULL;
   res->ref=0;

kernel/weight0.c

@@ -218 +218 @@
     {
       fy = fmax;
-      memcpy4(xopt, x + 1, a);
+      memcpy(xopt, x + 1, a);
     }
     t--;
@@ -327 +327 @@
       {
         x[s0]--;
-        memcpy4(xopt, x + 1, n * sizeof(int));
+        memcpy(xopt, x + 1, n * sizeof(int));
         if (s1==0)
           break;
@@ -335 +335 @@
         x[s1]--;
         x[s2]--;
-        memcpy4(xopt, x + 1, n * sizeof(int));
+        memcpy(xopt, x + 1, n * sizeof(int));
       }
       else