Changeset 9f9b9a1 in git

Timestamp:

Dec 5, 2000, 1:14:33 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

f5d749d38c446f41bbcbb94c4d426b74c3fec4ee

Parents:

a5189bc0c3a81e46d3450fdaaeff50a529e8a5b7

Message:

* fixed HAVE_PLURAL stuff


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

Location:

Singular

Files:

• pInline2.h (modified) (2 diffs)
• ring.h (modified) (2 diffs)

Singular/pInline2.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline2.h,v 1.20 2000-12-01 14:06:31 Singular Exp $
+ *  Version: $Id: pInline2.h,v 1.21 2000-12-05 12:14:32 obachman Exp $
  *******************************************************************/
 #ifndef PINLINE2_H
@@ -520 +520 @@
   if (pNext(p) == NULL)
   {
-#ifndef HAVE_PLURAL
-    q = r->p_Procs->p_Mult_mm(q, p, r);
-#else /* PLURAL */
-    q = r->p_Procs->nc_mm_Mult_p(p, q, r);
-#endif
+#ifdef HAVE_PLURAL
+    if (rIsPluralRing(r))
+      q = r->p_Procs->nc_mm_Mult_p(p, q, r);
+    else
+#endif HAVE_PLURAL
+      q = r->p_Procs->p_Mult_mm(q, p, r);
+
     r->p_Procs->p_Delete(&p, r);
     return q;

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.58 2000-11-25 13:02:44 Singular Exp $ */
+/* $Id: ring.h,v 1.59 2000-12-05 12:14:33 obachman Exp $ */
 
 /* includes */
@@ -233 +233 @@
 BOOLEAN rIsPolyVar(int i, ring r = currRing); 
 
+#ifdef HAVE_PLURAL
+inline BOOLEAN rIsPluralRing(ring r)
+{
+  return r->nc != NULL;
+}
+#endif
+
 #ifdef RDEBUG
 #define rTest(r)    rDBTest(r, __FILE__, __LINE__)