From 0aba1fa6f4c694883569eaefffe4fbf5668d9644 Mon Sep 17 00:00:00 2001
From: William Hart <goodwillhart@googlemail.com>
Date: Thu, 5 Nov 2015 18:07:38 +0000
Subject: [PATCH] long -> slong in partitions/ and partitions/test/.

---
 partitions/fmpz_fmpz.c                           |  4 ++--
 partitions/hrr_sum_arb.c                         | 16 ++++++++--------
 partitions/rademacher_bound.c                    |  2 +-
 partitions/test/t-partitions_fmpz_ui.c           |  2 +-
 partitions/test/t-partitions_fmpz_ui_threaded.c  |  2 +-
 .../test/t-partitions_fmpz_ui_using_doubles.c    |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/partitions/fmpz_fmpz.c b/partitions/fmpz_fmpz.c
index 737add99..952f7c64 100644
--- a/partitions/fmpz_fmpz.c
+++ b/partitions/fmpz_fmpz.c
@@ -54,7 +54,7 @@ worker(void * arg_ptr)
 /* TODO: set number of threads in child threads, for future
    multithreaded evaluation of single terms */
 static void
-hrr_sum_threaded(arb_t x, const fmpz_t n, long N, int use_doubles)
+hrr_sum_threaded(arb_t x, const fmpz_t n, slong N, int use_doubles)
 {
     arb_t y;
     pthread_t threads[2];
@@ -99,7 +99,7 @@ partitions_fmpz_fmpz(fmpz_t p, const fmpz_t n, int use_doubles)
     {
         arb_t x;
         arf_t bound;
-        long N;
+        slong N;
 
         arb_init(x);
         arf_init(bound);
diff --git a/partitions/hrr_sum_arb.c b/partitions/hrr_sum_arb.c
index 0ed0152a..f2f9e607 100644
--- a/partitions/hrr_sum_arb.c
+++ b/partitions/hrr_sum_arb.c
@@ -72,7 +72,7 @@ partitions_remainder_bound_log2(double n, double N)
 long
 partitions_hrr_needed_terms(double n)
 {
-    long N;
+    slong N;
     for (N = 1; partitions_remainder_bound_log2(n, N) > 10; N++);
     for ( ; partitions_remainder_bound(n, N) > 0.4; N++);
     return N;
@@ -111,13 +111,13 @@ log2_ceil(double x)
 {
     /* ceil(log2(n)) = bitcount(n-1);
        this is too large if x is a power of two */
-    return FLINT_BIT_COUNT((long) x);
+    return FLINT_BIT_COUNT((slong) x);
 }
 
 static long
-partitions_prec_bound(double n, long k, long N)
+partitions_prec_bound(double n, slong k, slong N)
 {
-    long prec;
+    slong prec;
 
     prec = partitions_term_bound(n, k);
     prec += log2_ceil(8 * N * (26 * (sqrt(n) / k) + 7 * bound_primes(k) + 22));
@@ -171,7 +171,7 @@ eval_trig_prod_d(trig_prod_t prod)
 }
 
 static void
-eval_trig_prod(arb_t sum, trig_prod_t prod, long prec)
+eval_trig_prod(arb_t sum, trig_prod_t prod, slong prec)
 {
     int i;
     mp_limb_t v;
@@ -216,7 +216,7 @@ eval_trig_prod(arb_t sum, trig_prod_t prod, long prec)
 }
 
 static void
-sinh_cosh_divk_precomp(arb_t sh, arb_t ch, arb_t ex, long k, long prec)
+sinh_cosh_divk_precomp(arb_t sh, arb_t ch, arb_t ex, slong k, slong prec)
 {
     arb_t t;
     arb_init(t);
@@ -234,12 +234,12 @@ sinh_cosh_divk_precomp(arb_t sh, arb_t ch, arb_t ex, long k, long prec)
 
 
 void
-partitions_hrr_sum_arb(arb_t x, const fmpz_t n, long N0, long N, int use_doubles)
+partitions_hrr_sum_arb(arb_t x, const fmpz_t n, slong N0, slong N, int use_doubles)
 {
     trig_prod_t prod;
     arb_t acc, C, t1, t2, t3, t4, exp1;
     fmpz_t n24;
-    long k, prec, res_prec, acc_prec, guard_bits;
+    slong k, prec, res_prec, acc_prec, guard_bits;
     double nd, Cd;
 
     if (fmpz_cmp_ui(n, 2) <= 0)
diff --git a/partitions/rademacher_bound.c b/partitions/rademacher_bound.c
index 8cefa351..8d56eb2c 100644
--- a/partitions/rademacher_bound.c
+++ b/partitions/rademacher_bound.c
@@ -26,7 +26,7 @@
 #include "partitions.h"
 
 static void
-_arf_sinh(arf_t y, const arf_t x, long prec)
+_arf_sinh(arf_t y, const arf_t x, slong prec)
 {
     arb_t t;
     arb_init(t);
diff --git a/partitions/test/t-partitions_fmpz_ui.c b/partitions/test/t-partitions_fmpz_ui.c
index 3fdaf397..24dca8f9 100644
--- a/partitions/test/t-partitions_fmpz_ui.c
+++ b/partitions/test/t-partitions_fmpz_ui.c
@@ -102,7 +102,7 @@ static const ulong testdata[][2] =
 int main(void)
 {
     flint_rand_t state;
-    long i;
+    slong i;
 
     printf("partitions_fmpz_ui....");
     fflush(stdout);
diff --git a/partitions/test/t-partitions_fmpz_ui_threaded.c b/partitions/test/t-partitions_fmpz_ui_threaded.c
index 2e6c3717..5d6ea586 100644
--- a/partitions/test/t-partitions_fmpz_ui_threaded.c
+++ b/partitions/test/t-partitions_fmpz_ui_threaded.c
@@ -105,7 +105,7 @@ static const ulong testdata[][2] =
 int main(void)
 {
     flint_rand_t state;
-    long i;
+    slong i;
 
     printf("partitions_fmpz_ui_threaded....");
     fflush(stdout);
diff --git a/partitions/test/t-partitions_fmpz_ui_using_doubles.c b/partitions/test/t-partitions_fmpz_ui_using_doubles.c
index 908606c5..7ff81576 100644
--- a/partitions/test/t-partitions_fmpz_ui_using_doubles.c
+++ b/partitions/test/t-partitions_fmpz_ui_using_doubles.c
@@ -102,7 +102,7 @@ static const ulong testdata[][2] =
 int main(void)
 {
     flint_rand_t state;
-    long i;
+    slong i;
 
     printf("partitions_fmpz_ui_using_doubles....");
     fflush(stdout);