don't include fmprb.h automatically in arb.h (also skips including fmpz_poly.h in arb.h)

This commit is contained in:
Fredrik Johansson 2016-02-25 20:57:12 +01:00
parent 793fa9abeb
commit 4702cd1f74
9 changed files with 16 additions and 13 deletions

View file

@ -23,6 +23,7 @@
******************************************************************************/
#include "fmpz_poly.h"
#include "acb.h"
void _gamma_rf_bsplit(fmpz * A, ulong a, ulong b);

View file

@ -23,6 +23,7 @@
******************************************************************************/
#include "fmpz_poly.h"
#include "acb.h"
void rising_difference_polynomial(fmpz * s, fmpz * c, ulong m);

View file

@ -27,6 +27,7 @@
#define ACB_MODULAR_H
#include <stdio.h>
#include "fmpz_poly.h"
#include "acb.h"
#ifdef __cplusplus

3
arb.h
View file

@ -33,7 +33,6 @@
#endif
#include <stdio.h>
#include "fmprb.h"
#include "mag.h"
#include "arf.h"
@ -96,6 +95,7 @@ _arb_vec_clear(arb_ptr v, slong n)
flint_free(v);
}
#ifdef FMPRB_H
ARB_INLINE void
arb_set_fmprb(arb_t x, const fmprb_t y)
{
@ -109,6 +109,7 @@ arb_get_fmprb(fmprb_t x, const arb_t y)
arf_get_fmpr(fmprb_midref(x), arb_midref(y));
mag_get_fmpr(fmprb_radref(x), arb_radref(y));
}
#endif
ARB_INLINE arf_ptr arb_mid_ptr(arb_t z) { return arb_midref(z); }
ARB_INLINE mag_ptr arb_rad_ptr(arb_t z) { return arb_radref(z); }

View file

@ -23,6 +23,7 @@
******************************************************************************/
#include "fmprb.h"
#include "arb.h"
void

View file

@ -23,10 +23,9 @@
******************************************************************************/
#include "fmpz_poly.h"
#include "arb.h"
void
_gamma_rf_bsplit(fmpz * A, ulong a, ulong b)
{

View file

@ -23,6 +23,7 @@
******************************************************************************/
#include "fmprb.h"
#include "arb.h"
int

View file

@ -32,7 +32,6 @@
#include "fmpz_vec.h"
#include "fmpq.h"
#include "arith.h"
#include "fmprb.h"
#include "arb.h"
#ifdef __cplusplus
@ -118,11 +117,6 @@ void bernoulli_rev_clear(bernoulli_rev_t iter);
slong bernoulli_bound_2exp_si(ulong n);
void bernoulli_fmprb_ui_zeta(fmprb_t b, ulong n, slong prec);
void bernoulli_fmprb_ui(fmprb_t b, ulong n, slong prec);
void _bernoulli_fmpq_ui_zeta(fmpz_t num, fmpz_t den, ulong n);
void _bernoulli_fmpq_ui(fmpz_t num, fmpz_t den, ulong n);

View file

@ -117,10 +117,6 @@ Memory management
Assignment and rounding
-------------------------------------------------------------------------------
.. function:: void arb_set_fmprb(arb_t y, const fmprb_t x)
.. function:: void arb_get_fmprb(fmprb_t y, const arb_t x)
.. function:: void arb_set(arb_t y, const arb_t x)
.. function:: void arb_set_arf(arb_t y, const arf_t x)
@ -135,6 +131,14 @@ Assignment and rounding
Sets *y* to the value of *x* without rounding.
.. function:: void arb_set_fmprb(arb_t y, const fmprb_t x)
.. function:: void arb_get_fmprb(fmprb_t y, const arb_t x)
Sets *y* to the value of *x* without rounding. These methods are
deprecated. To enable them, ``fmprb.h`` must be included before
including ``arb.h``.
.. function:: void arb_set_fmpz_2exp(arb_t y, const fmpz_t x, const fmpz_t e)
Sets *y* to `x \cdot 2^e`.