[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 48dc8d5eac1a82fad45c1e889f629fe5eb32aa69
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Tue Feb 28 19:32:52 2012 +0100

    fix: return value of enterid (for package)

diff --git a/Singular/ipid.cc b/Singular/ipid.cc
index 3af0d2b..c256267 100644
--- a/Singular/ipid.cc
+++ b/Singular/ipid.cc
@@ -233,14 +233,11 @@ idhdl enterid(const char * s, int lev, int t, idhdl* root, BOOLEAN init, BOOLEAN
   if (s==NULL) return NULL;
   idhdl h;
   s=omStrDup(s);
-  idhdl *save_root=root;
-  BOOLEAN to_reset;
   if (t==PACKAGE_CMD)
   {
     if (root!=&(basePack->idroot))
     {
       root=&(basePack->idroot);
-      to_reset=TRUE;
     }
   }
   // is it already defined in root ?
@@ -306,7 +303,6 @@ idhdl enterid(const char * s, int lev, int t, idhdl* root, BOOLEAN init, BOOLEAN
 #ifndef NDEBUG
   checkall();
 #endif
-  if (to_reset) root=save_root;
   return *root;
 
   errlabel:
@@ -314,7 +310,6 @@ idhdl enterid(const char * s, int lev, int t, idhdl* root, BOOLEAN init, BOOLEAN
     Werror("identifier `%s` in use",s);
     //listall();
     omFree((ADDRESS)s);
-    if (to_reset) root=save_root;
     return NULL;
 }
 void killid(const char * id, idhdl * ih)

-- 
an open source computer algebra system