Changeset 914b60 in git


Ignore:
Timestamp:
Jul 7, 2020, 1:39:18 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
4de3dc02c6b3c86bc0d8323974a83f6f90d4ede79bd7cb708540aed8dc6ea40c071e5b0ff24576e9
Parents:
249d818e57a3c49f4e561e2a5fe38db7dbc9f2c05077a383c48bb33609fae47828b72e91a10c545b
Message:
t push origin spielwieseMerge branch 'fingolfin-mh/fix-warnings' into spielwiese
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/Order/nforder_ideal.cc

    r249d81 r914b60  
    311311  } else if (i<0) {
    312312    Werror("not done yet");
     313    return NULL;
    313314  } else {
    314315    nforder_ideal *B = nf_idPower(A, i/2);
  • Singular/dyn_modules/cohomo/cohomo.cc

    r249d81 r914b60  
    77
    88#include "kernel/mod2.h"
     9
     10#if !defined(__CYGWIN__) || defined(STATIC_VERSION)
     11// acces from a module to routines from the main program
     12// does not work on windows (restrict of the dynamic linker),
     13// a static version is required:
     14// ./configure --with-builtinmodules=cohomo,...
     15
    916
    1017#include "omalloc/omalloc.h"
     
    3845#include <time.h>
    3946
    40 
    41 
    42 
    43 
    44 
    45 
    4647/***************************print(only for debugging)***********************************************/
    4748//print vector of integers.
     
    6061  }
    6162}
    62 
    6363
    6464//print vector of vectors of integers.
     
    9292  }
    9393}
    94 
    95 
    96 
    9794
    9895//only for T^2,
     
    13131310    {
    13141311      fset.erase(fset.begin()+i);
    1315       return fset;
    1316     }
    1317   }
     1312      break;
     1313    }
     1314  }
     1315  return fset;
    13181316}
    13191317
     
    41354133  for(int i=0;i<bvs.size();i++)
    41364134  {
    4137     for(int j=0;j<bvs.size(), j!=i; j++)
     4135    for(int j=0;j!=i; j++)
    41384136    {
    41394137      vs.push_back(bvs[j]);
     
    53335331  return MAX_TOK;
    53345332}
    5335 
    5336 
    53375333#endif
    5338 
    5339 
     5334#endif
     5335
     5336
  • Singular/dyn_modules/freealgebra/freealgebra.cc

    r249d81 r914b60  
    11#include "Singular/libsingular.h"
    22#include <vector>
     3
     4#if !defined(__CYGWIN__) || defined(STATIC_VERSION)
     5// acces from a module to routines from the main program
     6// does not work on windows (restrict of the dynamic linker),
     7// a static version is required:
     8// ./configure --with-builtinmodules=freealgebra,...
    39
    410#ifdef HAVE_SHIFTBBA
     
    457463  return (MAX_TOK);
    458464}
     465#endif
  • Singular/dyn_modules/subsets/subsets.cc

    r249d81 r914b60  
    11#include "Singular/libsingular.h"
     2
     3#if !defined(__CYGWIN__) || defined(STATIC_VERSION)
     4// acces from a module to routines from the main program
     5// does not work on windows (restrict of the dynamic linker),
     6// a static version is required:
     7// ./configure --with-builtinmodules=subsets,...
    28
    39#include <vector>
     
    7379  return (MAX_TOK);
    7480}
     81#endif
  • Singular/dyn_modules/systhreads/bytebuf.h

    r249d81 r914b60  
    3333    buf = allocate_space(cap);
    3434    memcpy(buf, other.buf, count);
     35    return *this;
    3536  }
    3637  ~ByteBuf() {
  • Singular/dyn_modules/systhreads/libthread.h

    r249d81 r914b60  
    2525  Job *startJob(ThreadPool *pool, Job *job, leftv arg);
    2626  Job *startJob(ThreadPool *pool, Job *job);
    27   Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps);
     27//   Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps);
    2828  void cancelJob(Job *job);
    2929  void waitJob(Job *job);
  • Singular/dyn_modules/systhreads/shared.cc

    r249d81 r914b60  
    14801480  ts->active = false;
    14811481  thread_lock.unlock();
     1482  return result;
    14821483}
    14831484
     
    24922493}
    24932494
    2494 Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps) {
    2495   if (job->pool) return NULL;
    2496   pool->scheduler->lock.lock();
    2497   bool cancelled = false;
    2498   job->addDep(ndeps, deps);
    2499   for (long i = 0; i < ndeps; i++) {
    2500     deps[i]->addNotify(job);
    2501     cancelled |= deps[i]->cancelled;
    2502   }
    2503   if (cancelled) {
    2504     job->pool = pool;
    2505     pool->cancelJob(job);
    2506   }
    2507   else
    2508     pool->attachJob(job);
    2509   pool->scheduler->lock.unlock();
    2510 }
     2495// Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps) {
     2496//   if (job->pool) return NULL;
     2497//   pool->scheduler->lock.lock();
     2498//   bool cancelled = false;
     2499//   job->addDep(ndeps, deps);
     2500//   for (long i = 0; i < ndeps; i++) {
     2501//     deps[i]->addNotify(job);
     2502//     cancelled |= deps[i]->cancelled;
     2503//   }
     2504//   if (cancelled) {
     2505//     job->pool = pool;
     2506//     pool->cancelJob(job);
     2507//   }
     2508//   else
     2509//     pool->attachJob(job);
     2510//   pool->scheduler->lock.unlock();
     2511//   return FIXME: missing/unclear what this is supposed to be
     2512// }
    25112513
    25122514void cancelJob(Job *job) {
  • Singular/eigenval_ip.cc

    r249d81 r914b60  
    216216      else
    217217      {
    218         if(e->m[i0]==NULL&&!nGreaterZero(pGetCoeff(e->m[i1]))||
    219            e->m[i1]==NULL&&
    220           (nGreaterZero(pGetCoeff(e->m[i0]))||pNext(e->m[i0])!=NULL)||
     218        if((e->m[i0]==NULL&&!nGreaterZero(pGetCoeff(e->m[i1])))||
     219           (e->m[i1]==NULL&&
     220            (nGreaterZero(pGetCoeff(e->m[i0]))||pNext(e->m[i0])!=NULL))||
    221221           e->m[i0]!=NULL&&e->m[i1]!=NULL&&
    222           (pNext(e->m[i0])!=NULL&&pNext(e->m[i1])==NULL||
    223            pNext(e->m[i0])==NULL&&pNext(e->m[i1])==NULL&&
    224            nGreater(pGetCoeff(e->m[i0]),pGetCoeff(e->m[i1]))))
     222            ((pNext(e->m[i0])!=NULL&&pNext(e->m[i1])==NULL)||
     223             (pNext(e->m[i0])==NULL&&pNext(e->m[i1])==NULL&&
     224             nGreater(pGetCoeff(e->m[i0]),pGetCoeff(e->m[i1])))))
    225225        {
    226226          poly e1=e->m[i0];
  • Singular/svd_si.h

    r249d81 r914b60  
    32253225            return;
    32263226        }
    3227         ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright && zrows==m);
     3227        ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m);
    32283228
    32293229        //
     
    34523452            return;
    34533453        }
    3454         ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright && zrows==n);
     3454        ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n);
    34553455
    34563456        //
     
    38603860            return;
    38613861        }
    3862         ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright && zrows==m);
     3862        ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m);
    38633863
    38643864        //
     
    40754075            return;
    40764076        }
    4077         ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright && zrows==n);
     4077        ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n);
    40784078
    40794079        //
     
    68976897                // First apply standard test to bottom of matrix
    68986898                //
    6899                 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 )
     6899                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) )
    69006900                {
    69016901                    e(m-1) = 0;
     
    69376937                // First apply standard test to top of matrix
    69386938                //
    6939                 if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || tol<0 && amp::abs<Precision>(e(ll))<=thresh )
     6939                if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || (tol<0 && amp::abs<Precision>(e(ll))<=thresh) )
    69406940                {
    69416941                    e(ll) = 0;
  • factory/cf_gcd.cc

    r249d81 r914b60  
    101101  if ( getCharacteristic() != 0 )
    102102  {
    103     if (0) ; // dummy, to be able to build without NTL and FLINT
     103    if (0) {} // dummy, to be able to build without NTL and FLINT
    104104    #if defined(HAVE_FLINT) && ( __FLINT_RELEASE >= 20503)
    105105    if ( isOn( SW_USE_FL_GCD_P)
Note: See TracChangeset for help on using the changeset viewer.