Changeset 654726 in git

Timestamp:

Feb 21, 2014, 6:08:14 PM (10 years ago)

Author:

Max Horn <max@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

95eeda3a1e872aa8bf8c2026afc43e8f691af0fb

Parents:

f3703ede5c22d96bd2f3453cbb4d60e88ccec264

Message:

Silence some warnings about unused code

Files:

• Singular/janet.cc (modified) (2 diffs)
• Singular/walk.cc (modified) (5 diffs)
• kernel/syz0.cc (modified) (2 diffs)
• libpolys/coeffs/bigintmat.cc (modified) (3 diffs)
• libpolys/polys/clapconv.cc (modified) (1 diff)
• libpolys/polys/kbuckets.cc (modified) (1 diff)
• libpolys/reporter/dError.cc (modified) (1 diff)

Singular/janet.cc

@@ -793 +793 @@
 }
 
+#if 0
 static void go_right(NodeM *current,poly_function disp)
 {
@@ -803 +804 @@
 }
 
-#if 0
 void ForEach(TreeM *t,poly_function disp)
 {

Singular/walk.cc

@@ -437 +437 @@
 #endif
 
+#ifdef CHECK_IDEAL_MWALK
 static void idString(ideal L, const char* st)
 {
@@ -448 +449 @@
   Print(" %s;", pString(L->m[nL-1]));
 }
-
-//unused
-//#if 0
+#endif
+
+#if defined(CHECK_IDEAL_MWALK) || defined(ENDWALKS)
 static void headidString(ideal L, char* st)
 {
@@ -462 +463 @@
   Print(" %s;", pString(pHead(L->m[nL-1])));
 }
-//#endif
-
-//unused
-//#if 0
+#endif
+
+#if defined(CHECK_IDEAL_MWALK) || defined(ENDWALKS)
 static void idElements(ideal L, char* st)
 {
@@ -503 +503 @@
   omFree(K);
 }
-//#endif
+#endif
 
 
@@ -4777 +4777 @@
     }
 
-  NEXT_VECTOR:
+  //NEXT_VECTOR:
     to = clock();
     //intvec* next_weight = MkInterRedNextWeight(curr_weight,target_weight,G);

kernel/syz0.cc

@@ -772 +772 @@
 }
 
+#if 0
 static void syMergeSortResolventFB(resolvente res,int length, int initial=1)
 {
@@ -826 +827 @@
   }
 }
+#endif
 
 BOOLEAN syTestOrder(ideal M)

libpolys/coeffs/bigintmat.cc

@@ -20 +20 @@
 #include <string.h>
 
+#if 0
 // Ungetestet
 static void bimRowContent(bigintmat *bimat, int rowpos, int colpos);
 static void bimReduce(bigintmat *bimat, int rpiv, int colpos,
                       int ready, int all);
-
+#endif
 
 
@@ -688 +689 @@
 }
 
+#if 0
 // Ungetestet
 // (According to C. Fieker) Seems to have a lot of memory leaks (pure adaptation of the
@@ -772 +774 @@
   }
 }
+#endif
 
 // columnwise concatination of two bigintmats

libpolys/polys/clapconv.cc

@@ -34 +34 @@
 static void convRecTrP ( const CanonicalForm & f, int * exp, poly & result, int offs, const ring r );
 
-static void convRecGFGF ( const CanonicalForm & f, int * exp, poly & result );
+//static void convRecGFGF ( const CanonicalForm & f, int * exp, poly & result );
 
 static number convFactoryNSingAN( const CanonicalForm &f, const ring r);

libpolys/polys/kbuckets.cc

@@ -1162 +1162 @@
   return rn;
 }
-static BOOLEAN nIsPseudoUnit(number n, ring r)
-{
-  if (rField_is_Zp(r))
-    return TRUE;
-
-  if (rParameter(r)==NULL)
-  {
-    return (n_Size(n,r->cf)==1);
-  }
-  //if (r->parameter!=NULL)
-  return (n_IsOne(n,r->cf) || n_IsMOne(n,r->cf));
-}
 
 #ifndef USE_COEF_BUCKETS
 void kBucketSimpleContent(kBucket_pt) {}
 #else
+static BOOLEAN nIsPseudoUnit(number n, ring r)
+{
+  if (rField_is_Zp(r))
+    return TRUE;
+
+  if (rParameter(r)==NULL)
+  {
+    return (n_Size(n,r->cf)==1);
+  }
+  //if (r->parameter!=NULL)
+  return (n_IsOne(n,r->cf) || n_IsMOne(n,r->cf));
+}
+
 void kBucketSimpleContent(kBucket_pt bucket)
 {

libpolys/reporter/dError.cc

@@ -50 +50 @@
 int dReportError(const char* fmt, ...)
 {
+#if 0
 #ifdef HAVE_EXECINFO_H
 #define SIZE 50
   void *buffer[SIZE+1]; int ret; 
+#endif
 #endif