Changeset 914b60 in git

Timestamp:

Jul 7, 2020, 1:39:18 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4de3dc02c6b3c86bc0d8323974a83f6f90d4ede79bd7cb708540aed8dc6ea40c071e5b0ff24576e9

Parents:

249d818e57a3c49f4e561e2a5fe38db7dbc9f2c05077a383c48bb33609fae47828b72e91a10c545b

Message:

t push origin spielwieseMerge branch 'fingolfin-mh/fix-warnings' into spielwiese

Files:

• Singular/dyn_modules/Order/nforder_ideal.cc (modified) (1 diff)
• Singular/dyn_modules/cohomo/cohomo.cc (modified) (7 diffs)
• Singular/dyn_modules/freealgebra/freealgebra.cc (modified) (2 diffs)
• Singular/dyn_modules/subsets/subsets.cc (modified) (2 diffs)
• Singular/dyn_modules/systhreads/bytebuf.h (modified) (1 diff)
• Singular/dyn_modules/systhreads/libthread.h (modified) (1 diff)
• Singular/dyn_modules/systhreads/shared.cc (modified) (2 diffs)
• Singular/eigenval_ip.cc (modified) (1 diff)
• Singular/svd_si.h (modified) (6 diffs)
• factory/cf_gcd.cc (modified) (1 diff)

Singular/dyn_modules/Order/nforder_ideal.cc

@@ -311 +311 @@
   } else if (i<0) {
     Werror("not done yet");
+    return NULL;
   } else {
     nforder_ideal *B = nf_idPower(A, i/2);

Singular/dyn_modules/cohomo/cohomo.cc

@@ -7 +7 @@
 
 #include "kernel/mod2.h"
+
+#if !defined(__CYGWIN__) || defined(STATIC_VERSION)
+// acces from a module to routines from the main program
+// does not work on windows (restrict of the dynamic linker),
+// a static version is required:
+// ./configure --with-builtinmodules=cohomo,...
+
 
 #include "omalloc/omalloc.h"
@@ -38 +45 @@
 #include <time.h>
 
-
-
-
-
-
-
 /***************************print(only for debugging)***********************************************/
 //print vector of integers.
@@ -60 +61 @@
   }
 }
-
 
 //print vector of vectors of integers.
@@ -92 +92 @@
   }
 }
-
-
-
 
 //only for T^2,
@@ -1313 +1310 @@
     {
       fset.erase(fset.begin()+i);
-      return fset;
-    }
-  }
+      break;
+    }
+  }
+  return fset;
 }
 
@@ -4135 +4133 @@
   for(int i=0;i<bvs.size();i++)
   {
-    for(int j=0;j<bvs.size(), j!=i; j++)
+    for(int j=0;j!=i; j++)
     {
       vs.push_back(bvs[j]);
@@ -5333 +5331 @@
   return MAX_TOK;
 }
-
-
 #endif
-
-
+#endif
+
+

Singular/dyn_modules/freealgebra/freealgebra.cc

@@ -1 +1 @@
 #include "Singular/libsingular.h"
 #include <vector>
+
+#if !defined(__CYGWIN__) || defined(STATIC_VERSION)
+// acces from a module to routines from the main program
+// does not work on windows (restrict of the dynamic linker),
+// a static version is required:
+// ./configure --with-builtinmodules=freealgebra,...
 
 #ifdef HAVE_SHIFTBBA
@@ -457 +463 @@
   return (MAX_TOK);
 }
+#endif

Singular/dyn_modules/subsets/subsets.cc

@@ -1 +1 @@
 #include "Singular/libsingular.h"
+
+#if !defined(__CYGWIN__) || defined(STATIC_VERSION)
+// acces from a module to routines from the main program
+// does not work on windows (restrict of the dynamic linker),
+// a static version is required:
+// ./configure --with-builtinmodules=subsets,...
 
 #include <vector>
@@ -73 +79 @@
   return (MAX_TOK);
 }
+#endif

Singular/dyn_modules/systhreads/bytebuf.h

@@ -33 +33 @@
     buf = allocate_space(cap);
     memcpy(buf, other.buf, count);
+    return *this;
   }
   ~ByteBuf() {

Singular/dyn_modules/systhreads/libthread.h

@@ -25 +25 @@
   Job *startJob(ThreadPool *pool, Job *job, leftv arg);
   Job *startJob(ThreadPool *pool, Job *job);
-  Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps);
+//   Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps);
   void cancelJob(Job *job);
   void waitJob(Job *job);

Singular/dyn_modules/systhreads/shared.cc

@@ -1480 +1480 @@
   ts->active = false;
   thread_lock.unlock();
+  return result;
 }
 
@@ -2492 +2493 @@
 }
 
-Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps) {
-  if (job->pool) return NULL;
-  pool->scheduler->lock.lock();
-  bool cancelled = false;
-  job->addDep(ndeps, deps);
-  for (long i = 0; i < ndeps; i++) {
-    deps[i]->addNotify(job);
-    cancelled |= deps[i]->cancelled;
-  }
-  if (cancelled) {
-    job->pool = pool;
-    pool->cancelJob(job);
-  }
-  else
-    pool->attachJob(job);
-  pool->scheduler->lock.unlock();
-}
+// Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps) {
+//   if (job->pool) return NULL;
+//   pool->scheduler->lock.lock();
+//   bool cancelled = false;
+//   job->addDep(ndeps, deps);
+//   for (long i = 0; i < ndeps; i++) {
+//     deps[i]->addNotify(job);
+//     cancelled |= deps[i]->cancelled;
+//   }
+//   if (cancelled) {
+//     job->pool = pool;
+//     pool->cancelJob(job);
+//   }
+//   else
+//     pool->attachJob(job);
+//   pool->scheduler->lock.unlock();
+//   return FIXME: missing/unclear what this is supposed to be
+// }
 
 void cancelJob(Job *job) {

Singular/eigenval_ip.cc

@@ -216 +216 @@
       else
       {
-        if(e->m[i0]==NULL&&!nGreaterZero(pGetCoeff(e->m[i1]))||
-           e->m[i1]==NULL&&
-          (nGreaterZero(pGetCoeff(e->m[i0]))||pNext(e->m[i0])!=NULL)||
+        if((e->m[i0]==NULL&&!nGreaterZero(pGetCoeff(e->m[i1])))||
+           (e->m[i1]==NULL&&
+            (nGreaterZero(pGetCoeff(e->m[i0]))||pNext(e->m[i0])!=NULL))||
            e->m[i0]!=NULL&&e->m[i1]!=NULL&&
-          (pNext(e->m[i0])!=NULL&&pNext(e->m[i1])==NULL||
-           pNext(e->m[i0])==NULL&&pNext(e->m[i1])==NULL&&
-           nGreater(pGetCoeff(e->m[i0]),pGetCoeff(e->m[i1]))))
+            ((pNext(e->m[i0])!=NULL&&pNext(e->m[i1])==NULL)||
+             (pNext(e->m[i0])==NULL&&pNext(e->m[i1])==NULL&&
+             nGreater(pGetCoeff(e->m[i0]),pGetCoeff(e->m[i1])))))
         {
           poly e1=e->m[i0];

Singular/svd_si.h

@@ -3225 +3225 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright && zrows==m);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m);
 
         //
@@ -3452 +3452 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright && zrows==n);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n);
 
         //
@@ -3860 +3860 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright && zrows==m);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m);
 
         //
@@ -4075 +4075 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright && zrows==n);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n);
 
         //
@@ -6897 +6897 @@
                 // First apply standard test to bottom of matrix
                 //
-                if( amp::abs<Precision>(e(m-1))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(m)) || tol<0 && amp::abs<Precision>(e(m-1))<=thresh )
+                if( amp::abs<Precision>(e(m-1))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(m)) || (tol<0 && amp::abs<Precision>(e(m-1))<=thresh) )
                 {
                     e(m-1) = 0;
@@ -6937 +6937 @@
                 // First apply standard test to top of matrix
                 //
-                if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || tol<0 && amp::abs<Precision>(e(ll))<=thresh )
+                if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || (tol<0 && amp::abs<Precision>(e(ll))<=thresh) )
                 {
                     e(ll) = 0;

factory/cf_gcd.cc

@@ -101 +101 @@
   if ( getCharacteristic() != 0 )
   {
-    if (0) ; // dummy, to be able to build without NTL and FLINT
+    if (0) {} // dummy, to be able to build without NTL and FLINT
     #if defined(HAVE_FLINT) && ( __FLINT_RELEASE >= 20503)
     if ( isOn( SW_USE_FL_GCD_P)