Changeset 4be499 in git

Timestamp:

Nov 17, 2022, 11:35:27 AM (17 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

164e0526f677f7a21cec1d5f3d60c633af308f0d

Parents:

5cf36cb1c99d617d81e98b1b6986dc9b03b3883f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-11-17 11:35:27+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-11-17 11:36:17+01:00

Message:

compiler warnings

Location:

Singular/dyn_modules

Files:

• cohomo/cohomo.cc (modified) (22 diffs)
• systhreads/shared.cc (modified) (11 diffs)

Singular/dyn_modules/cohomo/cohomo.cc

@@ -262 +262 @@
 }
 
-
-
 //returns the union of two vectors(as the union of sets)
 std::vector<int> vecUnion(std::vector<int> vec1, std::vector<int> vec2)
 {
   std::vector<int> vec=vec1;
-  int i;
+  unsigned i;
   for(i=0;i<vec2.size();i++)
   {
@@ -277 +275 @@
 }
 
-
-
 std::vector<int> vecMinus(std::vector<int> vec1,std::vector<int> vec2)
 {
   std::vector<int> vec;
-  for(int i=0;i<vec1.size();i++)
+  for(unsigned i=0;i<vec1.size();i++)
   {
     if(!IsinL(vec1[i],vec2))
@@ -291 +287 @@
   return vec;
 }
-
-
-
-
-
 
 std::vector<std::vector<int> > vsMinusv(std::vector<std::vector<int> > vecs, std::vector<int> vec)
@@ -1153 +1144 @@
   ideal h2=id_complement(h);
   std::vector<std::vector<int> > hvs=supports(h), h2v=supports(h2), vecs;
-  for(int i=0;i<h2v.size();i++)
+  for(unsigned i=0;i<h2v.size();i++)
   {
     pv=h2v[i];
@@ -1163 +1154 @@
   return vecs;
 }
-
-
-
-
-
-
-
-
-
-
 
 /***************************************************************************/
 //For solving the equations which has form of x_i-x_j.(equations got from T_1)
 /***************************************************************************/
-
-
 
 //subroutine for soleli1
@@ -1240 +1219 @@
 std::vector<std::vector<int> > soleli1( std::vector<std::vector<int> > eqs)
 {
-  int i,j;
+  int i;
   std::vector<int> yaya;
   std::vector<std::vector<int> >  pre=eqs, ppre, re;
@@ -2252 +2231 @@
 }
 
-
-
 /**************************************************************************/
-
-
-
-
-
-
-
-
 
 //subspace of T2(find all the possible values of alpha)
@@ -2268 +2237 @@
 {
   std::vector<int> alset;
-  for(int i=0;i<mv.size();i++)
+  for(unsigned i=0;i<mv.size();i++)
   {
     if(vsubset(bv,mv[i]))
@@ -2280 +2249 @@
 }
 
-
-
-
-
-
-
-
 std::vector<int> subspacet1(int num, std::vector<std::vector<int> > ntvs)
 {
@@ -2339 +2301 @@
   std::vector<int> v1,var;
   std::vector<std::vector<int> > vars;
-  for(int i=0;i<Mv.size();i++)
-  {
-    for(int j=i+1;j<Mv.size();j++)
+  for(unsigned i=0;i<Mv.size();i++)
+  {
+    for(unsigned j=i+1;j<Mv.size();j++)
     {
       var.clear();
@@ -2533 +2495 @@
   std::vector<int> v1,var;
   std::vector<std::vector<int> > vars;
-  for(int i=0;i<Nv.size();i++)
-  {
-    for(int j=i+1;j<Nv.size();j++)
+  for(unsigned i=0;i<Nv.size();i++)
+  {
+    for(unsigned j=i+1;j<Nv.size();j++)
     {
       var.clear();
@@ -2564 +2526 @@
   std::vector<int> sv;
   if(bvs.size()<=1) return false;
-  for(int i=0;i<bvs.size();i++)
+  for(unsigned i=0;i<bvs.size();i++)
   {
     sv=vecUnion(pv,bvs[i]);
@@ -2575 +2537 @@
 }
 
-
-
-
-
-
-
 std::vector<int>  tnab(std::vector<std::vector<int> > hvs,std::vector<std::vector<int> > nvs,std::vector<std::vector<int> > bvs)
 {
   std::vector<int> pv, vec;
-  for(int j=0;j<nvs.size();j++)
+  for(unsigned j=0;j<nvs.size();j++)
   {
     pv=nvs[j];
@@ -2619 +2575 @@
   std::vector<int> pv, base;
   std::vector<std::vector<int> > bases;
-  for(int t=0;t<vecs.size();t++)
-  {
-    for(int i=0;i<mvs.size();i++)
+  for(unsigned t=0;t<vecs.size();t++)
+  {
+    for(unsigned i=0;i<mvs.size();i++)
     {
       pv=phimage(mvs[i],av,bv);
@@ -2902 +2858 @@
 std::vector<std::vector<int> > subspacetn(std::vector<std::vector<int> >  N, std::vector<int>   tN, std::vector<std::vector<int> > ntvs)
 {
-  int i,j;
+  int i;
   std::vector<int> alset=findalphan(N,tN), subase;
   std::vector<std::vector<int> > subases;
@@ -2932 +2888 @@
   //listsprint(mts);
   //PrintS("mabt ends:\n");
-  for(int t=0;t<vecs.size();t++)
-  {
-    for(int i=0;i<mts.size();i++)
+  for(unsigned t=0;t<vecs.size();t++)
+  {
+    for(unsigned i=0;i<mts.size();i++)
     {
       row=mts[i][0];
@@ -3148 +3104 @@
   std::vector<int> base;
   std::vector<std::vector<int> > bases;
-  for(int t=0;t<vecs.size();t++)
-  {
-    for(int i=0;i<mvs.size();i++)
+  for(unsigned t=0;t<vecs.size();t++)
+  {
+    for(unsigned i=0;i<mvs.size();i++)
     {
       pv=phimagel(mvs[i], av, bv);
@@ -3293 +3249 @@
 
   }
-  for(int t=0;t<vecs.size();t++)
-  {
-    for(int i=0;i<mts.size();i++)
+  for(unsigned t=0;t<vecs.size();t++)
+  {
+    for(unsigned i=0;i<mts.size();i++)
     {
       row=mts[i][0];
@@ -3886 +3842 @@
   std::vector<std::vector<int> > ss=p_new(Sigma, Xo), fvs;
   std::vector<int> av=support1(a), intvec, vv;
-  for(int i=0;i<ss.size();i++)
+  for(unsigned i=0;i<ss.size();i++)
   {
     intvec=vecIntersection(ss[i], av);
@@ -4107 +4063 @@
   std::vector<int>  bvs=support1(b), vs;
   std::vector<std::vector<int> > bset;
-  for(int i=0;i<bvs.size();i++)
+  for(unsigned i=0;i<bvs.size();i++)
   {
     for(int j=0;j!=i; j++)
@@ -4751 +4707 @@
          sbv=supports(sub);
          std::vector<int> tnv =tnab(vecs,nvs,sbv);
-         for(int i=0;i<tnv.size();i++)
+         for(unsigned i=0;i<tnv.size();i++)
          {
            tnbr.push_back(nvs[tnv[i]]);
@@ -4826 +4782 @@
          std::vector<std::vector<poly> > pvs=idMakei(nv,ntvs);
          ideal gens=idInit(1,1);
-         for(int i=0;i<pvs.size();i++)
+         for(unsigned i=0;i<pvs.size();i++)
          {
            idInsertPoly(gens,pvs[i][0]);

Singular/dyn_modules/systhreads/shared.cc

@@ -761 +761 @@
   memset(&result, 0, sizeof(result));
   leftv *tail = &procnode->next;
-  for (int i = 0; i < argv.size(); i++) {
+  for (unsigned i = 0; i < argv.size(); i++) {
     *tail = argv[i];
     tail = &(*tail)->next;
@@ -1688 +1688 @@
   int threadpool_size(ThreadPool *pool) {
     int n;
-    for (int i = 0; i <thread_owners.size(); i++) {
+    for (unsigned i = 0; i <thread_owners.size(); i++) {
       if (thread_owners[i] == pool)
         n++;
@@ -1695 +1695 @@
   }
   virtual ~Scheduler() {
-    for (int i = 0; i < thread_queues.size(); i++) {
+    for (unsigned i = 0; i < thread_queues.size(); i++) {
       JobQueue *q = thread_queues[i];
       while (!q->empty()) {
@@ -1729 +1729 @@
     }
     lock.unlock();
-    for (int i = 0; i <threads.size(); i++) {
+    for (unsigned i = 0; i <threads.size(); i++) {
       joinThread(threads[i]);
     }
@@ -1776 +1776 @@
   void broadcastJob(ThreadPool *pool, Job *job) {
     lock.lock();
-    for (int i = 0; i <thread_queues.size(); i++) {
+    for (unsigned i = 0; i <thread_queues.size(); i++) {
       if (thread_owners[i] == pool) {
         acquireShared(job);
@@ -1786 +1786 @@
   void cancelDeps(Job * job) {
     vector<Job *> &notify = job->notify;
-    for (int i = 0; i <notify.size(); i++) {
+    for (unsigned i = 0; i <notify.size(); i++) {
       Job *next = notify[i];
       if (!next->cancelled) {
@@ -1830 +1830 @@
     vector<Job *> &notify = job->notify;
     job->incref(notify.size());
-    for (int i = 0; i <notify.size(); i++) {
+    for (unsigned i = 0; i <notify.size(); i++) {
       Job *next = notify[i];
       if (!next->queued && next->ready() && !next->cancelled) {
@@ -1841 +1841 @@
     if (triggers.size() > 0 && job->result.size() > 0)
       arg = LinTree::from_string(job->result);
-    for (int i = 0; i < triggers.size(); i++) {
+    for (unsigned i = 0; i < triggers.size(); i++) {
       Trigger *trigger = triggers[i];
       if (trigger->accept(arg)) {
@@ -2018 +2018 @@
     lists l = (lists) omAlloc0Bin(slists_bin);
     l->Init(args.size());
-    for (int i = 0; i < args.size(); i++) {
+    for (unsigned i = 0; i < args.size(); i++) {
       leftv val = LinTree::from_string(args[i]);
       memcpy(&l->m[i], val, sizeof(*val));
@@ -2103 +2103 @@
       pool->scheduler->lock.unlock();
       vector<leftv> argv;
-      for (int i = 0; i < args.size(); i++) {
+      for (unsigned i = 0; i < args.size(); i++) {
         appendArg(argv, args[i]);
       }
@@ -2420 +2420 @@
     if (argv.size() > 0) {
       leftv *tail = &argv[0]->next;
-      for (int i = 1; i < argv.size(); i++) {
+      for (unsigned i = 1; i < argv.size(); i++) {
         *tail = argv[i];
         tail = &(*tail)->next;