Changeset fd68165 in git


Ignore:
Timestamp:
Nov 7, 2013, 6:42:08 PM (9 years ago)
Author:
Janko Boehm <boehm@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')
Children:
bebd13f12467d52870735cd4cfae940241fef019
Parents:
4a4593a9cc860e3c2819808ef08faab1b9a48009
git-author:
Janko Boehm <boehm@mathematik.uni-kl.de>2013-11-07 18:42:08+01:00
git-committer:
Janko Boehm <boehm@mathematik.uni-kl.de>2013-11-07 18:46:02+01:00
Message:
Fixed name conflict INT64 and wrong type
Location:
factory
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • factory/ChangeLog

    r4a4593a rfd68165  
    191191Mon May 11 11:36:22 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
    192192
    193         * config.h.in (INT64): unused declarations for MetroWerks removed
     193        * config.h.in (FACTORY_INT64): unused declarations for MetroWerks removed
    194194
    195195        * imm.cc (imm_mul): wrapped by `#ifdef __MWERKS__'
     
    229229          be float, hence constant `2' replaced by `2.0'
    230230
    231         * config.h.in (INT64): new typedef for Metroworks compiler
     231        * config.h.in (FACTORY_INT64): new typedef for Metroworks compiler
    232232
    233233Mon Apr  6 14:06:49 MET DST 1998  Jens Schmidt
     
    571571          (distfiles): `bin/makeheader.pl' added to distribution
    572572
    573         * config.h.in (INT64): new define
     573        * config.h.in (FACTORY_INT64): new define
    574574
    575575        * bin/makeheader.pl: new file
     
    599599          version of factory.h for Windows NT
    600600
    601         * config.h.in: new typedef INT64 for 64 bit integer type of various
     601        * config.h.in: new typedef FACTORY_INT64 for 64 bit integer type of various
    602602          platforms (currently 'long long int' for gcc and '__int64' for
    603603          MS VC++)
     
    606606          to have prototypes for alloca and memcpy
    607607
    608         * ffops.h: now uses INT64 instead of long long int
    609 
    610         * ffops.cc: now uses INT64 instead of long long int
    611 
    612         * imm.h: now uses INT64 instead of long long int
     608        * ffops.h: now uses FACTORY_INT64 instead of long long int
     609
     610        * ffops.cc: now uses FACTORY_INT64 instead of long long int
     611
     612        * imm.h: now uses FACTORY_INT64 instead of long long int
    613613
    614614        * int_poly.cc: includes strstrea.h instead of strstream.h in the
  • factory/config.h.in.cmake

    r4a4593a rfd68165  
    8585
    8686/* define type of your compilers 64 bit integer type */
    87 #define INT64 long long int
     87#define FACTORY_INT64 long long int
    8888
    8989#cmakedefine HAVE_NTL 1
  • factory/configure.ac

    r4a4593a rfd68165  
    107107  enable_debugoutput=no)
    108108
    109 AH_TEMPLATE([INT64], [Defenition for INT64])
     109AH_TEMPLATE([FACTORY_INT64], [Defenition for FACTORY_INT64])
    110110# Always long long int???!
    111 AC_DEFINE([INT64], [long long int])
     111AC_DEFINE([FACTORY_INT64], [long long int])
    112112
    113113DX_INIT_DOXYGEN($PACKAGE_NAME, MYDOXYGENCONFIG)
  • factory/facAbsBiFact.cc

    r4a4593a rfd68165  
    416416    nmod_poly_factor_insert (nmodFactors, FLINTGpi, 1L);
    417417
    418     long * link= new long [2];
     418    slong * link= new slong [2];
    419419    fmpz_poly_t *v= new fmpz_poly_t[2];
    420420    fmpz_poly_t *w= new fmpz_poly_t[2];
  • factory/ffops.h

    r4a4593a rfd68165  
    1212
    1313/* define type of your compilers 64 bit integer type */
    14 #ifndef INT64
    15 #define INT64 long long int
     14#ifndef FACTORY_INT64
     15#define FACTORY_INT64 long long int
    1616#endif
    1717
     
    7777}
    7878
    79 inline int ff_bignorm ( const INT64 a )
     79inline int ff_bignorm ( const FACTORY_INT64 a )
    8080{
    81     int n = (int)(a % (INT64)ff_prime);
     81    int n = (int)(a % (FACTORY_INT64)ff_prime);
    8282#if defined(i386) || defined(NTL_AVOID_BRANCHING)
    8383    n += (n >> 31) & ff_prime;
     
    134134{
    135135    if ( ff_big )
    136         return ff_bignorm( (INT64)a * (INT64)b );
     136        return ff_bignorm( (FACTORY_INT64)a * (FACTORY_INT64)b );
    137137    else
    138138        return ff_longnorm ( (long)a * (long)b );
  • factory/imm.h

    r4a4593a rfd68165  
    3333
    3434/* define type of your compilers 64 bit integer type */
    35 #ifndef INT64
    36 #define INT64 long long int
     35#ifndef FACTORY_INT64
     36#define FACTORY_INT64 long long int
    3737#endif
    3838
     
    4646
    4747#if defined(WINNT) && ! defined(__GNUC__)
    48 const INT64 MINIMMEDIATELL = -268435454i64;
    49 const INT64 MAXIMMEDIATELL = 268435454i64;
     48const FACTORY_INT64 MINIMMEDIATELL = -268435454i64;
     49const FACTORY_INT64 MAXIMMEDIATELL = 268435454i64;
    5050#else
    51 const INT64 MINIMMEDIATELL = -268435454LL;
    52 const INT64 MAXIMMEDIATELL = 268435454LL;
     51const FACTORY_INT64 MINIMMEDIATELL = -268435454LL;
     52const FACTORY_INT64 MAXIMMEDIATELL = 268435454LL;
    5353#endif
    5454
     
    303303    long b = imm2int( rhs );
    304304    int sa= 1;
    305     unsigned INT64 aa, bb;
     305    unsigned FACTORY_INT64 aa, bb;
    306306    if (a < 0)
    307307    {
    308308      sa= -1;
    309       aa= (unsigned INT64) (-a);
    310     }
    311     else
    312       aa= (unsigned INT64) a;
     309      aa= (unsigned FACTORY_INT64) (-a);
     310    }
     311    else
     312      aa= (unsigned FACTORY_INT64) a;
    313313    if (b < 0)
    314314    {
    315315      sa= -sa;
    316       bb= (unsigned INT64) (-b);
    317     }
    318     else
    319       bb= (unsigned INT64) b;
    320     unsigned INT64 result = aa*bb;
     316      bb= (unsigned FACTORY_INT64) (-b);
     317    }
     318    else
     319      bb= (unsigned FACTORY_INT64) b;
     320    unsigned FACTORY_INT64 result = aa*bb;
    321321    #if SIZEOF_LONG == 4
    322     if (result>(unsigned INT64)MAXIMMEDIATE)
     322    if (result>(unsigned FACTORY_INT64)MAXIMMEDIATE)
    323323    {
    324324        InternalCF * res = CFFactory::basic( IntegerDomain, a, true );
     
    326326    }
    327327    #else
    328     if ( ( a!=0L ) && ((result/aa!=bb) || (result>(unsigned INT64) MAXIMMEDIATE) ))
     328    if ( ( a!=0L ) && ((result/aa!=bb) || (result>(unsigned FACTORY_INT64) MAXIMMEDIATE) ))
    329329    {
    330330        InternalCF * res = CFFactory::basic( IntegerDomain, a, true );
Note: See TracChangeset for help on using the changeset viewer.