[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 cbc77416c35a3b49c2ea408526716bb03f5d5802
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Tue Apr 10 14:58:44 2012 +0200

    fix: converting alias to any_type

diff --git a/Singular/iparith.cc b/Singular/iparith.cc
index 12400ed..668be32 100644
--- a/Singular/iparith.cc
+++ b/Singular/iparith.cc
@@ -670,7 +670,6 @@ static BOOLEAN jjPLUS_IV(leftv res, leftv u, leftv v)
      return TRUE;
   }
   return jjPLUSMINUS_Gen(res,u,v);
-  return FALSE;
 }
 static BOOLEAN jjPLUS_MA(leftv res, leftv u, leftv v)
 {
diff --git a/Singular/ipconv.cc b/Singular/ipconv.cc
index 80a9eb7..5b92f58 100644
--- a/Singular/ipconv.cc
+++ b/Singular/ipconv.cc
@@ -1,7 +1,6 @@
 /****************************************
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT: automatic type conversions
 */
@@ -277,8 +276,13 @@ BOOLEAN iiConvert (int inputType, int outputType, int index, leftv input, leftv
         output->name=omStrDup(IDID((idhdl)(input->data)));
       else if (input->name!=NULL)
       {
-        output->name=input->name;
-        input->name=NULL;
+        if (input->rtyp==ALIAS_CMD)
+          output->name=omStrDup(input->name);
+        else
+        {
+          output->name=input->name;
+          input->name=NULL;
+        }
       }
       else if ((input->rtyp==POLY_CMD) && (input->name==NULL))
       {

-- 
an open source computer algebra system