Changeset 8fdfd50 in git

Timestamp:

Oct 22, 2014, 4:06:04 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

37c772cb81032a12dd0c86fe97f20d65f539d9d3

Parents:

3d996b1452759180a1ab25db0deb191a5cf79fd2

Message:

fix: tr #658

File:

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

Singular/ipid.cc

@@ -174 +174 @@
       return (void*) omAlloc0Bin(sip_sring_bin);
     case PACKAGE_CMD:
-      return (void*) omAlloc0Bin(sip_package_bin);
+    {
+      package pa=(package)omAlloc0Bin(sip_package_bin);
+      pa->language=LANG_NONE;
+      pa->loaded = FALSE;
+      return (void*)pa;
+    }
     case PROC_CMD:
-      return (void *) omAlloc0Bin(procinfo_bin);
+    {
+      procinfov pi=(procinfov)omAlloc0Bin(procinfo_bin);
+      pi->ref=1;
+      pi->language=LANG_NONE;
+      return (void*)pi;
+    }
     case RESOLUTION_CMD:
       return  (void *)omAlloc0(sizeof(ssyStrategy));
@@ -228 +238 @@
       /* QRING_CMD is ring dep => currRing !=NULL */
     }
-    else
 #endif
-    if (t == PROC_CMD)
-    {
-      IDPROC(h)->language=LANG_NONE;
-      IDPROC(h)->ref=1;
-    }
-    else if (t == PACKAGE_CMD)
-    {
-      IDPACKAGE(h)->language=LANG_NONE;
-      IDPACKAGE(h)->loaded = FALSE;
-    }
   }
   // --------------------------------------------------------