Fix fmpz_mat_t declaration

sagemath · Oct 3, 2014 · 7843e3f · 7843e3f
1 parent 5b77c78
commit 7843e3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/sage/libs/flint/fmpz_mat.pxi b/src/sage/libs/flint/fmpz_mat.pxi
@@ -2,13 +2,18 @@ include "sage/libs/flint/fmpz.pxi"
 include "sage/libs/flint/fmpz_poly.pxi"
 
 cdef extern from "flint/fmpz_mat.h":
-    ctypedef void* fmpz_mat_t
+    ctypedef struct fmpz_mat_struct:
+        pass
+    ctypedef fmpz_mat_struct fmpz_mat_t[1]
+
     void fmpz_mat_init(fmpz_mat_t mat, unsigned long rows, unsigned long cols)
     void fmpz_mat_init_set(fmpz_mat_t mat, const fmpz_mat_t src)
     void fmpz_mat_set(fmpz_mat_t result, fmpz_mat_t mat)
     void fmpz_mat_clear(fmpz_mat_t mat)
     int fmpz_mat_print_pretty(const fmpz_mat_t mat)
     fmpz_t fmpz_mat_entry(fmpz_mat_t mat, long i, long j)
+    long fmpz_mat_nrows(fmpz_mat_t mat)
+    long fmpz_mat_ncols(fmpz_mat_t mat)
     void fmpz_mat_one(fmpz_mat_t mat)
     void fmpz_mat_zero(fmpz_mat_t mat)
     void fmpz_mat_neg(fmpz_mat_t f, fmpz_mat_t g)

diff --git a/src/sage/libs/fplll/fplll.pxd b/src/sage/libs/fplll/fplll.pxd
@@ -4,12 +4,3 @@ include "fplll.pxi"
 cdef class FP_LLL:
     cdef object fp_map
     cdef ZZ_mat[mpz_t] *_lattice
-
-cdef extern from "flint/fmpz.h":
-    ctypedef void* fmpz_t
-    void fmpz_get_mpz(mpz_t x, const fmpz_t f)
-    void fmpz_set_mpz(fmpz_t f, const mpz_t val)
-
-cdef extern from "flint/fmpz_mat.h":
-    ctypedef void* fmpz_mat_t
-    fmpz_t fmpz_mat_entry(fmpz_mat_t mat ,long i ,long j)
diff --git a/src/sage/matrix/matrix_integer_dense.pyx b/src/sage/matrix/matrix_integer_dense.pyx
@@ -3440,10 +3440,10 @@ cdef class Matrix_integer_dense(matrix_dense.Matrix_dense):   # dense or sparse
         80.  The check that the determinant of a squared matrix is a
         square is a sanity check that the result is probably correct::
 
-            sage: for s in [1..80]:  # long time (6s on sage.math, 2013)
-            ...       M = random_matrix(ZZ, s)
-            ...       d = (M*M).determinant()
-            ...       assert d.is_square()
+            sage: for s in [1..80]:  # long time
+            ....:     M = random_matrix(ZZ, s)
+            ....:     d = (M*M).determinant()
+            ....:     assert d.is_square()
         """
         d = self.fetch('det')
         if d is not None: