Changeset bebd13f in git

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:

• Singular/ipassign.cc (modified) (1 diff)
• Tst/New/redTail.res.gz.uu (modified) (1 diff)
• Tst/New/redTail.stat (modified) (1 diff)
• factory/ChangeLog (modified) (5 diffs)
• factory/config.h.in.cmake (modified) (1 diff)
• factory/configure.ac (modified) (1 diff)
• factory/facAbsBiFact.cc (modified) (1 diff)
• factory/ffops.h (modified) (3 diffs)
• factory/imm.h (modified) (4 diffs)

Singular/ipassign.cc

@@ -887 +887 @@
   if ((l->rtyp==IDHDL)&&(lt!=QRING_CMD)&&(lt!=RING_CMD))
     ld=(leftv)l->data;
+  if (lt>MAX_TOK)
+  {
+    blackbox *bb=getBlackboxStuff(lt);
+#ifdef BLACKBOX_DEVEL
+    Print("bb-assign: bb=%lx\n",bb);
+#endif
+    return (bb==NULL) || bb->blackbox_Assign(l,r);
+  }
   while (((dAssign[i].res!=lt)
       || (dAssign[i].arg!=rt))

Tst/New/redTail.res.gz.uu

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

Tst/New/redTail.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:164552
-1 >> tst_memory_1 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:2215632
-1 >> tst_memory_2 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:2368248
-1 >> tst_timer_1 :: 1361531898:3160:3-1-6:x86_64-Linux:dilbert:6
+1 >> tst_memory_0 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:185248
+1 >> tst_memory_1 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:2240280
+1 >> tst_memory_2 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:2392896
+1 >> tst_timer_1 :: 1383848596:3.1.3.sw, 64 bit:spielwiese:x86_64-Linux:nepomuck:1

factory/ChangeLog

@@ -191 +191 @@
 Mon May 11 11:36:22 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
 
-        * config.h.in (INT64): unused declarations for MetroWerks removed
+        * config.h.in (FACTORY_INT64): unused declarations for MetroWerks removed
 
         * imm.cc (imm_mul): wrapped by `#ifdef __MWERKS__'
@@ -229 +229 @@
           be float, hence constant `2' replaced by `2.0'
 
-        * config.h.in (INT64): new typedef for Metroworks compiler
+        * config.h.in (FACTORY_INT64): new typedef for Metroworks compiler
 
 Mon Apr  6 14:06:49 MET DST 1998  Jens Schmidt
@@ -571 +571 @@
           (distfiles): `bin/makeheader.pl' added to distribution
 
-        * config.h.in (INT64): new define
+        * config.h.in (FACTORY_INT64): new define
 
         * bin/makeheader.pl: new file
@@ -599 +599 @@
           version of factory.h for Windows NT
 
-        * config.h.in: new typedef INT64 for 64 bit integer type of various
+        * config.h.in: new typedef FACTORY_INT64 for 64 bit integer type of various
           platforms (currently 'long long int' for gcc and '__int64' for
           MS VC++)
@@ -606 +606 @@
           to have prototypes for alloca and memcpy
 
-        * ffops.h: now uses INT64 instead of long long int
-
-        * ffops.cc: now uses INT64 instead of long long int
-
-        * imm.h: now uses INT64 instead of long long int
+        * ffops.h: now uses FACTORY_INT64 instead of long long int
+
+        * ffops.cc: now uses FACTORY_INT64 instead of long long int
+
+        * imm.h: now uses FACTORY_INT64 instead of long long int
 
         * int_poly.cc: includes strstrea.h instead of strstream.h in the

factory/config.h.in.cmake

@@ -85 +85 @@
 
 /* define type of your compilers 64 bit integer type */
-#define INT64 long long int
+#define FACTORY_INT64 long long int
 
 #cmakedefine HAVE_NTL 1

factory/configure.ac

@@ -107 +107 @@
   enable_debugoutput=no)
 
-AH_TEMPLATE([INT64], [Defenition for INT64])
+AH_TEMPLATE([FACTORY_INT64], [Defenition for FACTORY_INT64])
 # Always long long int???!
-AC_DEFINE([INT64], [long long int]) 
+AC_DEFINE([FACTORY_INT64], [long long int]) 
 
 DX_INIT_DOXYGEN($PACKAGE_NAME, MYDOXYGENCONFIG)

factory/facAbsBiFact.cc

@@ -416 +416 @@
     nmod_poly_factor_insert (nmodFactors, FLINTGpi, 1L);
 
-    long * link= new long [2];
+    slong * link= new slong [2];
     fmpz_poly_t *v= new fmpz_poly_t[2];
     fmpz_poly_t *w= new fmpz_poly_t[2];

factory/ffops.h

@@ -12 +12 @@
 
 /* define type of your compilers 64 bit integer type */
-#ifndef INT64
-#define INT64 long long int
+#ifndef FACTORY_INT64
+#define FACTORY_INT64 long long int
 #endif
 
@@ -77 +77 @@
 }
 
-inline int ff_bignorm ( const INT64 a )
+inline int ff_bignorm ( const FACTORY_INT64 a )
 {
-    int n = (int)(a % (INT64)ff_prime);
+    int n = (int)(a % (FACTORY_INT64)ff_prime);
 #if defined(i386) || defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
@@ -134 +134 @@
 {
     if ( ff_big )
-        return ff_bignorm( (INT64)a * (INT64)b );
+        return ff_bignorm( (FACTORY_INT64)a * (FACTORY_INT64)b );
     else
         return ff_longnorm ( (long)a * (long)b );

factory/imm.h

@@ -33 +33 @@
 
 /* define type of your compilers 64 bit integer type */
-#ifndef INT64
-#define INT64 long long int
+#ifndef FACTORY_INT64
+#define FACTORY_INT64 long long int
 #endif
 
@@ -46 +46 @@
 
 #if defined(WINNT) && ! defined(__GNUC__)
-const INT64 MINIMMEDIATELL = -268435454i64;
-const INT64 MAXIMMEDIATELL = 268435454i64;
+const FACTORY_INT64 MINIMMEDIATELL = -268435454i64;
+const FACTORY_INT64 MAXIMMEDIATELL = 268435454i64;
 #else
-const INT64 MINIMMEDIATELL = -268435454LL;
-const INT64 MAXIMMEDIATELL = 268435454LL;
+const FACTORY_INT64 MINIMMEDIATELL = -268435454LL;
+const FACTORY_INT64 MAXIMMEDIATELL = 268435454LL;
 #endif
 
@@ -303 +303 @@
     long b = imm2int( rhs );
     int sa= 1;
-    unsigned INT64 aa, bb;
+    unsigned FACTORY_INT64 aa, bb;
     if (a < 0)
     {
       sa= -1;
-      aa= (unsigned INT64) (-a);
-    }
-    else
-      aa= (unsigned INT64) a;
+      aa= (unsigned FACTORY_INT64) (-a);
+    }
+    else
+      aa= (unsigned FACTORY_INT64) a;
     if (b < 0)
     {
       sa= -sa;
-      bb= (unsigned INT64) (-b);
-    }
-    else
-      bb= (unsigned INT64) b;
-    unsigned INT64 result = aa*bb;
+      bb= (unsigned FACTORY_INT64) (-b);
+    }
+    else
+      bb= (unsigned FACTORY_INT64) b;
+    unsigned FACTORY_INT64 result = aa*bb;
     #if SIZEOF_LONG == 4
-    if (result>(unsigned INT64)MAXIMMEDIATE)
+    if (result>(unsigned FACTORY_INT64)MAXIMMEDIATE)
     {
         InternalCF * res = CFFactory::basic( IntegerDomain, a, true );
@@ -326 +326 @@
     }
     #else
-    if ( ( a!=0L ) && ((result/aa!=bb) || (result>(unsigned INT64) MAXIMMEDIATE) ))
+    if ( ( a!=0L ) && ((result/aa!=bb) || (result>(unsigned FACTORY_INT64) MAXIMMEDIATE) ))
     {
         InternalCF * res = CFFactory::basic( IntegerDomain, a, true );