Changeset b541aa in git for Singular/ipshell.cc

Timestamp:

Feb 4, 2016, 4:20:38 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1adac1b2916bf7e04ad3ec1f5e9c7c86be2e4de5

Parents:

97dff9a14f3e5550ae2956080f77f6d154f4f0f9

Message:

SINGULAR_4_1: ring_list

File:

• Singular/ipshell.cc (modified) (9 diffs)

Singular/ipshell.cc

@@ -1690 +1690 @@
 }
 #ifdef SINGULAR_4_1
-static void rDecomposeC(leftv h,const coeffs C)
+static void rDecomposeC_41(leftv h,const coeffs C)
 /* field is R or C */
 {
@@ -1724 +1724 @@
   // ----------------------------------------
 }
-#else
+#endif
 static void rDecomposeC(leftv h,const ring R)
 /* field is R or C */
@@ -1759 +1759 @@
   // ----------------------------------------
 }
-#endif
 
 #ifdef SINGULAR_4_1
 #ifdef HAVE_RINGS
-void rDecomposeRing(leftv h,const coeffs C)
+void rDecomposeRing_41(leftv h,const coeffs C)
 /* field is R or C */
 {
@@ -1790 +1789 @@
 }
 #endif
-#else
+#endif
+
 #ifdef HAVE_RINGS
 void rDecomposeRing(leftv h,const ring R)
@@ -1819 +1819 @@
 }
 #endif
-#endif
 
 
@@ -1835 +1834 @@
   if (nCoeff_is_numeric(C))
   {
-    rDecomposeC(res,C);
+    rDecomposeC_41(res,C);
   }
 #ifdef HAVE_RINGS
   else if (nCoeff_is_Ring(C))
   {
-    rDecomposeRing(res,C);
+    rDecomposeRing_41(res,C);
   }
 #endif
@@ -1896 +1895 @@
 
 #ifdef SINGULAR_4_1
-lists rDecompose(const ring r)
+lists rDecompose_list_cf(const ring r)
 {
   assume( r != NULL );
@@ -2029 +2028 @@
 #endif
 
-#ifndef SINGULAR_4_1
 lists rDecompose(const ring r)
 {
@@ -2216 +2214 @@
   return L;
 }
-#endif
 
 void rComposeC(lists L, ring R)