Changeset e77676 in git for libpolys/coeffs/coeffs.h

Timestamp:

Jan 6, 2012, 9:43:08 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

4b38e3cc9992129dd4ef044c1d2cc7e55f93b134

Parents:

40e88db63c509564c2b00b7142b39ef6b846f72e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:43:08+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:59:37+01:00

Message:

Zp cleanup (no more coeffs::npPrimeM)

CHG: removed coeffs::npPrimeM in favour of coeffs::ch

File:

• libpolys/coeffs/coeffs.h (modified) (3 diffs)

libpolys/coeffs/coeffs.h

@@ -102 +102 @@
    void (*cfCoeffWrite)(const coeffs r, BOOLEAN details);
 
-   // the union stuff
-
-   // Zp:
-   int npPrimeM;
-   int npPminus1M;
-   #ifdef HAVE_DIV_MOD
-   unsigned short *npInvTable;
-   #endif
-   #if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-   unsigned short *npExpTable;
-   unsigned short *npLogTable;
-   #endif
-
    // ?
    // initialisation:
@@ -209 +196 @@
    int     factoryVarOffset;
    n_coeffType type;
-//-------------------------------------------
+
+   /////////////////////////////////////////////
+   // the union stuff
+
+   //-------------------------------------------
 
   /* for extension fields we need to be able to represent polynomials,
@@ -276 +267 @@
   int *m_nfMinPoly;
   char * m_nfParameter;
+
+// ---------------------------------------------------
+// for Zp:
+#ifdef HAVE_DIV_MOD
+  unsigned short *npInvTable;
+#endif
+#if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
+  unsigned short *npExpTable;
+  unsigned short *npLogTable;
+#endif
+   //   int npPrimeM; // NOTE: npPrimeM is deprecated, please use ch instead!
+  int npPminus1M; ///< characteristic - 1
 };
 //