changed the location of get_set functions

rperrot · Oct 16, 2019 · d0843f7 · d0843f7
1 parent ed330d5
commit d0843f7
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/fq.h b/fq.h
@@ -23,6 +23,7 @@
 #endif
 
 #include "fmpz_mod_poly.h"
+#include "fmpz_mod_mat.h"
 #include "ulong_extras.h"
 
 /* Data types and context ****************************************************/
@@ -383,7 +384,9 @@ FLINT_DLL void fq_bit_unpack(fq_t rop, const fmpz_t f, flint_bitcnt_t bit_size,
 
 #define T fq
 #define CAP_T FQ
+#define B fmpz_mod
 #include "fq_templates.h"
+#undef B
 #undef CAP_T
 #undef T
 

diff --git a/fq_embed/get_set_fmpz_mod_mat.c → fq/get_set_fmpz_mod_mat.c b/fq_embed/get_set_fmpz_mod_mat.c → fq/get_set_fmpz_mod_mat.c
@@ -9,7 +9,7 @@
     (at your option) any later version.  See <http://www.gnu.org/licenses/>.
 */
 
-#include "fq_embed.h"
+#include "fq.h"
 
 void fq_get_fmpz_mod_mat(fmpz_mod_mat_t col,
                          const fq_t a,

diff --git a/fq_nmod.h b/fq_nmod.h
@@ -23,6 +23,7 @@
 #endif
 
 #include "nmod_poly.h"
+#include "nmod_mat.h"
 #include "ulong_extras.h"
 
 /* Data types and context ****************************************************/
@@ -416,7 +417,9 @@ FLINT_DLL void fq_nmod_bit_unpack(fq_nmod_t rop, const fmpz_t f, flint_bitcnt_t
 
 #define T fq_nmod
 #define CAP_T FQ_NMOD
+#define B nmod
 #include "fq_templates.h"
+#undef B
 #undef CAP_T
 #undef T
 

diff --git a/fq_nmod_embed/get_set_fmpz_mod_mat.c → fq_nmod/get_set_fmpz_mod_mat.c b/fq_nmod_embed/get_set_fmpz_mod_mat.c → fq_nmod/get_set_fmpz_mod_mat.c
@@ -9,7 +9,7 @@
     (at your option) any later version.  See <http://www.gnu.org/licenses/>.
 */
 
-#include "fq_nmod_embed.h"
+#include "fq_nmod.h"
 
 void fq_nmod_get_nmod_mat(nmod_mat_t col,
                           const fq_nmod_t a,

diff --git a/fq_templates.h b/fq_templates.h
@@ -29,6 +29,16 @@ FLINT_DLL void TEMPLATE(T, div)(TEMPLATE(T, t) rop, const TEMPLATE(T, t) op1,
 FLINT_DLL int TEMPLATE(T, multiplicative_order)(fmpz_t ord, const TEMPLATE(T, t) op,
                              const TEMPLATE(T, ctx_t) ctx);
 
+#ifdef B
+FLINT_DLL void TEMPLATE4(T, get, B, mat)(TEMPLATE(B, mat_t) col,
+                                         const TEMPLATE(T, t) a,
+                                         const TEMPLATE(T, ctx_t) ctx);
+FLINT_DLL void TEMPLATE4(T, set, B, mat)(TEMPLATE(T, t) a,
+                                         const TEMPLATE(B, mat_t) col,
+                                         const TEMPLATE(T, ctx_t) ctx);
+#endif
+
+
 FQ_TEMPLATES_INLINE
 int TEMPLATE(T, is_primitive)(const TEMPLATE(T, t) op, const TEMPLATE(T, ctx_t) ctx)
 {

diff --git a/fq_zech.h b/fq_zech.h
@@ -324,7 +324,9 @@ FLINT_DLL void fq_zech_bit_unpack(fq_zech_t rop, const fmpz_t f, flint_bitcnt_t
 
 #define T fq_zech
 #define CAP_T FQ_ZECH
+#define B nmod
 #include "fq_templates.h"
+#undef B
 #undef CAP_T
 #undef T
 

diff --git a/fq_zech_embed/get_set_fmpz_mod_mat.c → fq_zech/get_set_fmpz_mod_mat.c b/fq_zech_embed/get_set_fmpz_mod_mat.c → fq_zech/get_set_fmpz_mod_mat.c
@@ -9,7 +9,7 @@
     (at your option) any later version.  See <http://www.gnu.org/licenses/>.
 */
 
-#include "fq_zech_embed.h"
+#include "fq_zech.h"
 
 void fq_zech_get_nmod_mat(nmod_mat_t col,
                           const fq_zech_t a,