Changeset 9f6d76 in git for kernel/kutil.cc

Timestamp:

Jul 8, 2008, 3:30:54 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c9c60f894de6f136a5e83377562698e0806b77c5

Parents:

037df40dbab143539ea3af97c89eb20fada1b68e

Message:

*hannes: syntax


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

File:

• kernel/kutil.cc (modified) (15 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.98 2008-07-08 13:02:21 Singular Exp $ */
+/* $Id: kutil.cc,v 1.99 2008-07-08 13:29:46 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
 */
-
-#ifndef KUTIL_CC
-#define KUTIL_CC
 
 // #define PDEBUG 2
@@ -39 +36 @@
 
 #include "kutil.h"
+#include "kbuckets.h"
 #include "febase.h"
 #include "omalloc.h"
@@ -6093 +6091 @@
 #endif
 
-#ifdef HAVE_PLURAL
-
+#ifdef HAVE_SHIFTBBA
 poly pMove2CurrTail(poly p, kStrategy strat)
 {
@@ -6106 +6103 @@
   return(p);
 }
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 poly pMoveCurrTail2poly(poly p, kStrategy strat)
 {
@@ -6121 +6120 @@
   return(p);
 }
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 poly pCopyL2p(LObject H, kStrategy strat)
 {
@@ -6157 +6158 @@
     return(p);
 }
+#endif
 
 //LObject pCopyp2L(poly p, kStrategy strat)
@@ -6239 +6241 @@
   /* what about setting strat->tl? */
 }
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 void initBuchMoraShift (ideal F,ideal Q,kStrategy strat)
 {
@@ -6309 +6313 @@
   /* is done by other procedure */
 }
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 /*1
 * put the pairs (sh \dot s[i],p)  into the set B, ecart=ecart(p)
@@ -6382 +6388 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 /*1
 * put the pairs (sh \dot qq,p)  into the set B, ecart=ecart(p)
@@ -6446 +6454 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 /*2
 * put the pair (q,p)  into the set B, ecart=ecart(p), q is the shift of some s[i]
@@ -6743 +6753 @@
   }
 }
-
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 /*2
 *(s[0],h),...,(s[k],h) will be put to the pairset L(via initenterpairs)
@@ -6775 +6786 @@
  // PrintS("end enterpairs\n");
 }
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 /*3
 *(s[0], s \dot h),...,(s[k],s \dot h) will be put to the pairset L
@@ -6846 +6859 @@
 #endif
 
-
-
-
+#ifdef HAVE_SHIFTBBA
 /*2
 * puts p to the set T, starting with the at position atT
@@ -6892 +6903 @@
 /* Solution: it is done by enterT each time separately */
 }
-
-
-
+#endif
+
+#ifdef HAVE_SHIFTBBA
 poly redtailBbaShift (LObject* L, int pos, kStrategy strat, BOOLEAN withT, BOOLEAN normalize)
 {
@@ -6975 +6986 @@
   return L->GetLmCurrRing();
 }
-
-#endif // HAVE_SHIFTBBA
-#endif // KUTIL_CC
+#endif