Changeset bebd13f in git


Ignore:
Timestamp:
Nov 8, 2013, 10:18:53 AM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')
Children:
35c26414eab02dda7305d2a199bc7a351daf705d
Parents:
13f7b2794703c329b4c6179ef9db9eb16b305824fd6816507d9d8040e8379a880a5d36da704d9da1
Message:
Merge pull request #417 from jankoboehm/spielwiese

Fixed name conflict INT64 and wrong type (windows port)
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • Singular/ipassign.cc

    rfd68165 rbebd13f  
    887887  if ((l->rtyp==IDHDL)&&(lt!=QRING_CMD)&&(lt!=RING_CMD))
    888888    ld=(leftv)l->data;
     889  if (lt>MAX_TOK)
     890  {
     891    blackbox *bb=getBlackboxStuff(lt);
     892#ifdef BLACKBOX_DEVEL
     893    Print("bb-assign: bb=%lx\n",bb);
     894#endif
     895    return (bb==NULL) || bb->blackbox_Assign(l,r);
     896  }
    889897  while (((dAssign[i].res!=lt)
    890898      || (dAssign[i].arg!=rt))
  • Tst/New/redTail.res.gz.uu

    rfd68165 rbebd13f  
    1 begin 644 redTail.res.gz
    2 M'XL("/I3)U$``W)E9%1A:6PN<F5S`.U8W4_;,!!_[U]Q0CS8(PGY:BF@1-K$
    3 M2R3$PZCV@J#*$M-::],J=D?+M/]]=CZ<T&:0"C:$%"2(?7>^^_E^=Y>(Z]%%
    4 M<`4`E@^7P1<XX(P;,_K]X+QW76AL'X1P3!/*$3[OR2?X/J0D'H5T9B3DP6`\
    5 MY,K>\4&M70,62TX7B3QY?)ROV9D\3.YI0F#%P@F!9;J8+RL/_9J'@0$I32;P
    6 MU3.U-3(-P\5:O*S0G?A`8Q+.(/#T-7+PG7VT1C;^M$;"4"^6#A9"JQ):2F@6
    7 M0FEX9U<JK5C96"^,G.)D%L#,=16,H0_!>2^XL6YW80BQG8EWL`B-DVEV``F-
    8 M>^MMHQ+2OI3N0!.*0>&HCD_!._7A^+B@`A`G832MP%NFH52""8[/5?HM41:E
    9 MZB%,$Z$2?CAA')#M'#FU%%BV7^,Z"F>S<FL8!B`3PG3",*Y7@0Q6UE'VG*:+
    10 MU60*-.'7/`TYF6R:*P4D%A6X5G"6*#C&8Q24$.0FBV^5\94X*QO<NW'-T_Z9
    11 M=6NC/F8B\XS)!4,#S!QT@O7\IR<"QZN(0Y123E*!_VP`T32D24UB]<:R`'+^
    12 M]8K_L>1?T:]7](\E_8I=O6)__(3]2OH7]L>2_9Q\?8=\J]9.EF@G<9,(1JC2
    13 MGQCP2VV&!M1H+*2VJ)"\#=-*9C=:"@)`,`8!>%F6Y^$Z2[0`5[,:J+-0/SQ4
    14 M85)QW-306H.-!H]8@Y@I,\=LBNS8;2([;F-D1P)2&P'CM]J<5MES3>-]2MP5
    15 M;3A2,9'LT@C_%P"OBO&27\60`(-;]ZMENL/^B6Q92U0Y8ZRA-YV=WC1[(6-T
    16 MDN1O"R_[^V]OU\KO/C1\H'3M6=[O]>IP:Z\.5TP&^9TCOV563`P-U6T9"/M)
    17 M@A$Z#*Z^?;X,+@XUM2J33Q\)FE%6<N1+OK2*LYM,61/PS9(L[E&8;,9R64@]
    18 M#S$NAZ&6/[!B).&>^,VM\AO&:!M$@[SE\2:S.9DOTDVM[HJDN&V2LN6PV.:7
    19 M\O)'6;5RW53/1]NIV-?^F:`OL-4<NKB_L\?]FV)O&"?SY@9^@ZLU0V\I;8=:
    20 M=<4VR2N^F(><1@#1(OE)4B9?N+D7T'V8T>1'[BTE88SD=O^;M`'2BN-,_\3U
    21 MMD68Q"^>T7?ZO`"MQ&]#U<[\>)-B>?)148X%,?833N\I29]%]"!?&]L\M*Z`
    22 M;KATPZ4;+MUPZ89+-URZX=(-EX\S7+9SW<V6;K9TLZ6;+:^<+>4_I/H^'/;^
    23 )`"H>+AR@&P``
     1begin 640 redTail.res.gz
     2M'XL(")3:>U(``W)E9%1A:6PN<F5S`+5538^;,!"]YU>,5CV8+A!LDV^%0]4+
     3M4M5#DUN41330!"E+(NQHV5;][QT#:].%K5(UY8+]YNOA-V-6ZX_A9P"@`7P*
     4M/\"=%-(]9E_O%H-58V$!(!AE>2:)M1BH-P0!%&FRCK.CFZ=/KI"QU/X\`+WV
     5M73B=97;*5>1P6*_%7`6GW[(\A8N(]RF<B]/CV608M3*,72BR?`]?EIY=$L]U
     6M?<M.SH;=)(`L2>,CA$NG)-QZ8/<E8=;[DJ"CTRRYA2`U(-6@UX#*\8$9D]VL
     7MF.4T3KR)K`IXM<W0F`80+@;AAFZ[-!!F%=SA@A9>63J$T.)OEZ]9(3I2:(<:
     8M&L9-HC8_36\6P'#82`%$IO'N8,A3S]4F5$):"WW\%-OBQ?04%SF:,(],A03"
     9M^#UO'0%E0;_6*N5+MU3O0W&Z[`^0Y7(EBUBF^^?^?@!54:=OM17%MA(R(2$6
     10MVOC>;#2G6T9&EL"#$T(M!!E;@I.)Y=3/`#,FEYV$79')M$!B\S'L#G&6MQ`Z
     11MB)1^M7R.D2]2\FGU'*->I-33XCA&O.@W\0SZAGB1$J_6SNEH1UO30'$:\$MV
     12ML";&/G'AA]Y,76BIT*`,!:ZGJ#`8Z_7$DP64`D)85D?\&)?5>"&YEM=8QT([
     13M>*K+%!CNV:2TX=F&[Y8-B=!NW.NKS-DUE;G?6YDK0GJ#-'[JS<R<GN^]<1O=
     14MID-]G)7U;3-?D>D/T1OJ^=/11$T'Q8820O2,`>^,@?>/95]'7_FM-V/[EZK]
     15BWVO+;UU;/C:O^I.JO^5%8%_K_O5QQM\-?@'B#C/^BP<`````
    2416`
    2517end
  • Tst/New/redTail.stat

    rfd68165 rbebd13f  
    1 1 >> tst_memory_0 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:164552
    2 1 >> tst_memory_1 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:2215632
    3 1 >> tst_memory_2 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:2368248
    4 1 >> tst_timer_1 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:6
     11 >> tst_memory_0 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:185248
     21 >> tst_memory_1 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:2240280
     31 >> tst_memory_2 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:2392896
     41 >> tst_timer_1 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:1
  • factory/ChangeLog

    r13f7b2 rbebd13f  
    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

    r13f7b2 rbebd13f  
    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

    r13f7b2 rbebd13f  
    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

    r13f7b2 rbebd13f  
    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

    r13f7b2 rbebd13f  
    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

    r13f7b2 rbebd13f  
    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.