Changeset d60626 in git

Timestamp:

Jan 11, 2007, 11:37:35 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8716be2e191c917ded9d525d95527e5828b8b42b

Parents:

d312f60de15be42c43e4d046f839a626576dfc89

Message:

*hannes: PLURAL TEST


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

Location:

kernel

Files:

• kbuckets.cc (modified) (2 diffs)
• kspoly.cc (modified) (3 diffs)
• ring.cc (modified) (4 diffs)

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.29 2006-12-18 20:45:08 motsak Exp $ */
+/* $Id: kbuckets.cc,v 1.30 2007-01-11 10:37:34 Singular Exp $ */
 
 #include "mod2.h"
@@ -12 +12 @@
 #include "kbuckets.h"
 #include "numbers.h"
+#include "ring.h"
 #include "p_Procs.h"
 

kernel/kspoly.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kspoly.cc,v 1.7 2007-01-03 00:17:10 motsak Exp $ */
+/* $Id: kspoly.cc,v 1.8 2007-01-11 10:37:35 Singular Exp $ */
 /*
 *  ABSTRACT -  Routines for Spoly creation and reductions
@@ -66 +66 @@
             p_MaxComp(pNext(p2),tailRing) == 0));
 
+#ifdef HAVE_PLURAL
   if (rIsPluralRing(currRing))
   {
@@ -85 +86 @@
     return 0;
   }
+#endif
 
   if (t2==NULL)           // Divisor is just one term, therefore it will

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.52 2007-01-09 13:07:04 Singular Exp $ */
+/* $Id: ring.cc,v 1.53 2007-01-11 10:37:35 Singular Exp $ */
 
 /*
@@ -27 +27 @@
 #ifdef HAVE_PLURAL
 #include "gring.h"
+#endif
+#include "maps.h"
 #include "matpol.h"
-#include "maps.h"
-#endif
 #ifdef HAVE_FACTORY
 #include "factory.h"
@@ -3998 +3998 @@
   return Renv;
 }
-
+#ifdef HAVE_PLURAL
 BOOLEAN nc_rComplete(ring src, ring dest)
 /* returns TRUE is there were errors */
@@ -4063 +4063 @@
   return FALSE;
 }
+#endif
 
 void rModify_a_to_A(ring r)