Changeset 7ec0614 in git for Singular/subexpr.cc

Timestamp:

Oct 26, 2010, 12:06:40 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a53ae5000c439608b9dcf884b63d62b219e8fcc0

Parents:

f7449ff74c2f2331426674adbf6689f8bb8c3e8c

Message:

took out type 'fan'; now only type 'cone' is there when built with HAVE_FANS defined (by default, HAVE_FANS is undefined)


git-svn-id: file:///usr/local/Singular/svn/trunk@13569 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/subexpr.cc (modified) (8 diffs)

Singular/subexpr.cc

@@ -14 +14 @@
 
 #include <kernel/mod2.h>
-#ifdef HAVE_FANS
-#include <sstream>
-#endif
 #include <kernel/intvec.h>
 #include <Singular/tok.h>
@@ -41 +38 @@
 #include <Singular/attrib.h>
 #include <Singular/subexpr.h>
-#include <Singular/Fan.h>
 #include <gfanlib/gfanlib.h>
 
@@ -69 +65 @@
 
 #ifdef HAVE_FANS
+#include <sstream>
 std::string toString(gfan::ZMatrix const &m, char *tab=0)
 {
@@ -234 +231 @@
 #ifdef HAVE_FANS
        case CONE_CMD:
-       case FAN_CMD:
+       //case FAN_CMD:
           PrintNSpaces(spaces);
           {
@@ -577 +574 @@
       }
 #ifdef HAVE_FANS
-    case FAN_CMD:
+/*    case FAN_CMD:
       {
         Fan* fff = (Fan*)d;
         Fan* ggg = new Fan(*fff);
         return ggg;
-      }
+      }*/
     case CONE_CMD:
       {
@@ -877 +874 @@
           return s;
 #ifdef HAVE_FANS
-        case FAN_CMD:
+/*        case FAN_CMD:
         {
           Fan* fff = (Fan*)d;
@@ -886 +883 @@
           omFree(s);
           return ns;
-        }
+        }*/
         case CONE_CMD:
         {
@@ -894 +891 @@
           sprintf(ns, "%s", s.c_str());
           omCheckAddr(ns);
-          omFree(s);
           return ns;
         }