Changeset 5edb77 in git for Singular/iparith.cc

Timestamp:

Nov 20, 2012, 7:16:16 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e3b071b7b8022789a70d9aeead7d9b8159679c57

Parents:

8e51caea071beef6e0f3c31472a9553c63c8df6d

Message:

fix: iiMake_proc (gcc 4.7)

File:

• Singular/iparith.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -1557 +1557 @@
   int typ;
   BOOLEAN t=FALSE;
+  idhdl tmp_proc=NULL;
   if ((u->rtyp!=IDHDL)||(u->e!=NULL))
   {
-    idrec tmp_proc;
-    tmp_proc.id="_auto";
-    tmp_proc.typ=PROC_CMD;
-    tmp_proc.data.pinf=(procinfo *)u->Data();
-    tmp_proc.ref=1;
-    d=u->data; u->data=(void *)&tmp_proc;
+    tmp_proc=(idhdl)omAlloc0(sizeof(idrec));
+    tmp_proc->id="_auto";
+    tmp_proc->typ=PROC_CMD;
+    tmp_proc->data.pinf=(procinfo *)u->Data();
+    tmp_proc->ref=1;
+    d=u->data; u->data=(void *)tmp_proc;
     e=u->e; u->e=NULL;
     t=TRUE;
     typ=u->rtyp; u->rtyp=IDHDL;
   }
-  leftv sl;
+  BOOLEAN sl;
   if (u->req_packhdl==currPack)
     sl = iiMake_proc((idhdl)u->data,NULL,v);
@@ -1579 +1580 @@
     u->data=d;
     u->e=e;
-  }
-  if (sl==NULL)
-  {
-    return TRUE;
-  }
-  else
-  {
-    memcpy(res,&iiRETURNEXPR,sizeof(sleftv));
-  }
+    omFreeSize(tmp_proc,sizeof(idrec));
+  }
+  if (sl) return TRUE;
+  memcpy(res,&iiRETURNEXPR,sizeof(sleftv));
   iiRETURNEXPR.Init();
   return FALSE;