Changeset 139f6f in git

Timestamp:

Sep 10, 2012, 2:45:31 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

fd2316c2e0e6f039690abb0a0f07314d57dc7ef5

Parents:

1130ffcea9f0651b2cb15d5f7ea1758fc8cf75aa

git-author:

Martin Lee <martinlee84@web.de>2012-09-10 14:45:31+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-25 15:10:31+02:00

Message:

chg: new include paths of flint header due to newer version

Location:

factory

Files:

• FLINTconvert.cc (modified) (2 diffs)
• FLINTconvert.h (modified) (1 diff)

factory/FLINTconvert.cc

@@ -36 +36 @@
 #define __GMP_BITS_PER_MP_LIMB GMP_LIMB_BITS
 #endif
-#include <fmpz.h>
-#include <fmpq.h>
-#include <fmpz_poly.h>
-#include <fmpz_mod_poly.h>
-#include <nmod_poly.h>
-#include <fmpq_poly.h>
+#include <flint/fmpz.h>
+#include <flint/fmpq.h>
+#include <flint/fmpz_poly.h>
+#include <flint/fmpz_mod_poly.h>
+#include <flint/nmod_poly.h>
+#include <flint/fmpq_poly.h>
 #ifdef __cplusplus
 }
@@ -270 +270 @@
   long i;
 
-  for (i = 0; i < fac->num_factors; i++)
-    result.append (CFFactor (convertnmod_poly_t2FacCF ((nmod_poly_t &)fac->factors[i],x),
-                             fac->exponents[i]));
+  for (i = 0; i < fac->num; i++)
+    result.append (CFFactor (convertnmod_poly_t2FacCF ((nmod_poly_t &)fac->p[i],x),
+                             fac->exp[i]));
   return result;
 }

factory/FLINTconvert.h

@@ -27 +27 @@
 #define __GMP_BITS_PER_MP_LIMB GMP_LIMB_BITS
 #endif
-#include <fmpz.h>
-#include <fmpq.h>
-#include <fmpz_poly.h>
-#include <fmpz_mod_poly.h>
-#include <fmpq_poly.h>
-#include <nmod_poly.h>
+#include <flint/fmpz.h>
+#include <flint/fmpq.h>
+#include <flint/fmpz_poly.h>
+#include <flint/fmpz_mod_poly.h>
+#include <flint/fmpq_poly.h>
+#include <flint/nmod_poly.h>
 #ifdef __cplusplus
 }