|
 |
06e7417 |
--- src/basemath/arith1.c
|
|
|
06e7417 |
+++ src/basemath/arith1.c
|
|
 |
085e6a4 |
@@ -3621,7 +3621,7 @@ GEN
|
|
|
06e7417 |
Fp_order(GEN a, GEN o, GEN p) {
|
|
|
06e7417 |
if (lgefint(p) == 3 && (!o || typ(o) == t_INT))
|
|
|
06e7417 |
{
|
|
|
06e7417 |
- ulong pp = p[2], oo = (o && lgefint(o)==3)? o[2]: pp-1;
|
|
|
06e7417 |
+ ulong pp = p[2], oo = (o && lgefint(o)==3)? (ulong)(o[2]): pp-1;
|
|
|
06e7417 |
return utoi( Fl_order(umodiu(a, pp), oo, pp) );
|
|
|
06e7417 |
}
|
|
|
06e7417 |
return gen_order(a, o, (void*)p, &Fp_star);
|
|
|
085e6a4 |
@@ -4109,7 +4109,7 @@ Fl_log_Fp(ulong a, ulong g, ulong ord, u
|
|
|
80bdf67 |
{
|
|
|
80bdf67 |
pari_sp av = avma;
|
|
|
80bdf67 |
GEN r = Fp_log(utoi(a),utoi(g),utoi(ord),utoi(p));
|
|
|
80bdf67 |
- ulong z = typ(r)==t_INT ? itou(r): ~0L;
|
|
|
80bdf67 |
+ ulong z = (typ(r)==t_INT) ? itou(r): ~0UL;
|
|
|
80bdf67 |
avma = av; return z;
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
|
|
|
80bdf67 |
--- src/basemath/base4.c
|
|
|
80bdf67 |
+++ src/basemath/base4.c
|
|
|
80bdf67 |
@@ -504,7 +504,7 @@ idealHNF_Z_factor_i(GEN x, GEN f0, GEN *
|
|
|
80bdf67 |
for (i = 1; i < l; i++)
|
|
|
80bdf67 |
{
|
|
|
80bdf67 |
GEN p = gel(P,i);
|
|
|
80bdf67 |
- vZ[i] = f0? Z_pval(xZ, p): itou(gel(E,i));
|
|
|
80bdf67 |
+ vZ[i] = f0? Z_pval(xZ, p): itos(gel(E,i));
|
|
|
80bdf67 |
vN[i] = idealHNF_norm_pval(x,p, vZ[i]);
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
return P;
|
|
|
80bdf67 |
--- src/basemath/char.c
|
|
|
80bdf67 |
+++ src/basemath/char.c
|
|
|
80bdf67 |
@@ -407,7 +407,7 @@ zv_cyc_minimize(GEN cyc, GEN g, GEN copr
|
|
|
80bdf67 |
gk = vecmoduu(gk, cyc);
|
|
|
80bdf67 |
if (vecsmall_lexcmp(gk, best) < 0) { best = gk; bestk = k; }
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
- avma = av; return bestk == 1? k0: Fl_mul(k0, bestk, o);
|
|
|
80bdf67 |
+ avma = av; return bestk == 1? k0: (long)Fl_mul(k0, bestk, o);
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
/* g of order o in abelian group G attached to cyc. Is g a minimal generator
|
|
|
80bdf67 |
* [wrt lex order] of the cyclic subgroup it generates;
|
|
|
06e7417 |
--- src/basemath/hyperell.c
|
|
|
06e7417 |
+++ src/basemath/hyperell.c
|
|
|
80bdf67 |
@@ -683,7 +683,7 @@ Flx_genus2charpoly_naive(GEN H, ulong p)
|
|
|
06e7417 |
{
|
|
|
06e7417 |
GEN r2 = gel(V, n+1);
|
|
|
06e7417 |
c += uel(r2,2) ?
|
|
|
06e7417 |
- (uel(r2,1) ? k[1+Fl2_norm_pre(r2, D, p, pi)]: e)
|
|
|
06e7417 |
+ (uel(r2,1) ? (ulong)(k[1+Fl2_norm_pre(r2, D, p, pi)]): e)
|
|
|
06e7417 |
: !!uel(r2,1);
|
|
|
06e7417 |
if (i == p-1) break;
|
|
|
06e7417 |
V = Fl2V_next(V, p);
|
|
|
80bdf67 |
--- src/basemath/mftrace.c
|
|
|
80bdf67 |
+++ src/basemath/mftrace.c
|
|
|
6ea0596 |
@@ -10980,7 +10980,7 @@ mfslashexpansion(GEN mf, GEN f, GEN ga,
|
|
|
80bdf67 |
long CD = (C * D) % N, BC = (B * C) % F;
|
|
|
80bdf67 |
GEN CV, t;
|
|
|
80bdf67 |
/* weight of f * Theta in 1/2-integral weight */
|
|
|
80bdf67 |
- k = typ(gk) == t_INT? itou(gk): MF_get_r(mf)+1;
|
|
|
80bdf67 |
+ k = (typ(gk) == t_INT)? itos(gk): MF_get_r(mf)+1;
|
|
|
80bdf67 |
CV = odd(k) ? powuu(N, k - 1) : powuu(N, k >> 1);
|
|
|
80bdf67 |
deg = ulcm(ulcm(ord, N/ugcd(N,CD)), F/ugcd(F,BC));
|
|
|
085e6a4 |
if (typ(gk) != t_INT && (C & 3) && odd(deg)) deg <<= 2;/* must adjoin I */
|
|
|
80bdf67 |
--- src/basemath/nffactor.c
|
|
|
80bdf67 |
+++ src/basemath/nffactor.c
|
|
|
085e6a4 |
@@ -2062,7 +2062,7 @@ guess_roots(GEN nf)
|
|
|
80bdf67 |
/* the gcd of the p^f - 1 is p^(gcd of the f's) - 1 */
|
|
|
80bdf67 |
for (i = 1; i <= nfdegree; i++)
|
|
|
80bdf67 |
if (F[i]) {
|
|
|
80bdf67 |
- gcdf = gcdf? ugcd(gcdf, i): i;
|
|
|
80bdf67 |
+ gcdf = gcdf? (long)ugcd(gcdf, i): i;
|
|
|
80bdf67 |
if (gcdf == 1) break;
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
pf_1 = subiu(powuu(p, gcdf), 1);
|
|
|
80bdf67 |
--- src/language/sumiter.c
|
|
|
80bdf67 |
+++ src/language/sumiter.c
|
|
|
80bdf67 |
@@ -269,14 +269,14 @@ forfactored(GEN a, GEN b, GEN code)
|
|
|
80bdf67 |
sb = signe(b);
|
|
|
80bdf67 |
if (sa < 0)
|
|
|
80bdf67 |
{
|
|
|
80bdf67 |
- stop = forfactoredneg((sb < 0)? b[2]: 1UL, itou(a), code);
|
|
|
80bdf67 |
+ stop = forfactoredneg((sb < 0)? (ulong)b[2]: 1UL, itou(a), code);
|
|
|
80bdf67 |
if (!stop && sb >= 0) stop = eval0(code);
|
|
|
80bdf67 |
if (!stop && sb > 0) forfactoredpos(1UL, b[2], code);
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
else
|
|
|
80bdf67 |
{
|
|
|
80bdf67 |
if (!sa) stop = eval0(code);
|
|
|
80bdf67 |
- if (!stop && sb) forfactoredpos(sa? a[2]: 1UL, itou(b), code);
|
|
|
80bdf67 |
+ if (!stop && sb) forfactoredpos(sa? (ulong)a[2]: 1UL, itou(b), code);
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
pop_lex(1); avma = av;
|
|
|
80bdf67 |
}
|