[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 23f73f7972a8c1e1a583dedb3d060bf53c6dc1aa
Author: Yue Ren <ren at mathematik.uni-kl.de>
Date:   Tue Mar 27 15:30:14 2012 +0200

    fix: isSmooth, wrong casts

diff --git a/callpolymake/polymake_wrapper.cc b/callpolymake/polymake_wrapper.cc
index f8dca15..7d374de 100644
--- a/callpolymake/polymake_wrapper.cc
+++ b/callpolymake/polymake_wrapper.cc
@@ -927,11 +927,11 @@ BOOLEAN PMisSmooth(leftv res, leftv args)
   }
   if ((u != NULL) && (u->Typ() == fanID))
   {
-    gfan::ZCone* zf = (gfan::ZCone*)u->Data();
+    gfan::ZFan* zf = (gfan::ZFan*)u->Data();
     bool b;
     try
     {
-      polymake::perl::Object* p = ZPolytope2PmPolytope(zf);
+      polymake::perl::Object* p = ZFan2PmFan(zf);
       b = p->give("SMOOTH_FAN");
       delete p;
     }
@@ -1534,11 +1534,10 @@ BOOLEAN normalFan(leftv res, leftv args)
     try
     {
       polymake::perl::Object* p=ZPolytope2PmPolytope(zp);
-      polymake::perl::Object* pf;
-      CallPolymakeFunction("normal_fan", p) >> *pf;
+      polymake::perl::Object pf;
+      CallPolymakeFunction("normal_fan", *p) >> pf;
       delete p;
-      zf = PmFan2ZFan(pf);
-      delete pf;
+      zf = PmFan2ZFan(&pf);
     }
     catch (const std::exception& ex) 
     {

-- 
an open source computer algebra system