Fix bugs in flintxx

fredrik-johansson · Jul 31, 2015 · 0b64139 · 0b64139
1 parent 57b4d52
commit 0b64139
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/arith.h b/arith.h
@@ -201,7 +201,7 @@ FLINT_DLL void arith_landau_function_vec(fmpz * res, slong len);
 /* Dedekind sums *************************************************************/
 
 #define arith_dedekind_sum_naive fmpq_dedekind_sum_naive
-#define arith_dedekind_sum_coprime_d d_dedekind_sum_coprime
+#define arith_dedekind_sum_coprime_d fmpq_dedekind_sum_coprime_d
 #define arith_dedekind_sum_coprime_large fmpq_dedekind_sum_coprime_large
 #define arith_dedekind_sum_coprime fmpq_dedekind_sum_coprime
 #define arith_dedekind_sum fmpq_dedekind_sum

diff --git a/flintxx/test/t-codegen.cpp b/flintxx/test/t-codegen.cpp
@@ -639,9 +639,9 @@ DEFINE_FUNC(test_nmod_matxx_2,
         (nmodxx& to, const nmod_matxx& A))
 {
     nmod_mat_t tmp1, tmp2;
-    nmod_mat_init(tmp1, nmod_mat_nrows(A._mat()), nmod_mat_ncols(A._mat()),
+    nmod_mat_init(tmp1, nmod_mat_nrows(A._mat()), nmod_mat_cols(A._mat()),
             A.modulus());
-    nmod_mat_init(tmp2, nmod_mat_ncols(A._mat()), nmod_mat_ncols(A._mat()),
+    nmod_mat_init(tmp2, nmod_mat_cols(A._mat()), nmod_mat_cols(A._mat()),
             A.modulus());
     nmod_mat_transpose(tmp1, A._mat());
     nmod_mat_mul(tmp1, tmp2, A._mat());

diff --git a/nmod_matxx.h b/nmod_matxx.h
@@ -241,7 +241,7 @@ struct matrix_traits<nmod_matxx>
     }
     template<class M> static slong cols(const M& m)
     {
-        return nmod_mat_ncols(m._mat());
+        return nmod_mat_cols(m._mat());
     }
 
     template<class M> static nmodxx_srcref at(const M& m, slong i, slong j)

diff --git a/padic_mat.h b/padic_mat.h
@@ -74,19 +74,14 @@ fmpz * padic_mat_entry(const padic_mat_t A, slong i, slong j)
 }
 
 #define padic_mat_val(A) ((A)->val)
+#define padic_mat_prec(A) ((A)->N)
 
 PADIC_MAT_INLINE
 slong padic_mat_get_val(const padic_mat_t A)
 {
    return A->val;
 }
 
-PADIC_MAT_INLINE
-slong padic_mat_prec(const padic_mat_t A)
-{
-   return A->N;
-}
-
 PADIC_MAT_INLINE
 slong padic_mat_nrows(const padic_mat_t A)
 {