Changeset 4c6bd3 in git for factory

Timestamp:

Jul 29, 2020, 6:52:15 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

a4def5de5fc8f3646db998861fba3a4f46fbab56

Parents:

700b89d0131c4b3d214f49af1eeb67501875ec89

Message:

fix: factorize in Z[x,..], w/o NTL, with -O3

Location:

factory

Files:

• canonicalform.cc (modified) (1 diff)
• canonicalform.h (modified) (1 diff)
• int_pp.h (modified) (2 diffs)

factory/canonicalform.cc

@@ -1967 +1967 @@
 }
 
-#ifndef HAVE_NTL
-static int initialized=0;
-int
-initCanonicalForm( void )
-{
-  if ( ! initialized )
-  {
-    initPT();
-    initialized = true;
-  }
-}
-#endif
-

factory/canonicalform.h

@@ -403 +403 @@
 
 /*ENDPUBLIC*/
-#ifndef HAVE_NTL
-int initCanonicalForm( void );
-static int cf_is_initialized_now = initCanonicalForm();
-#endif
 #endif /* ! INCL_CANONICALFORM_H */

factory/int_pp.h

@@ -6 +6 @@
 // #include "config.h"
 
+#include "cf_defs.h"
 #include "factory/cf_gmp.h"
 
@@ -31 +32 @@
     STATIC_VAR int exp;
     static void initialize();
+    static mpz_ptr MPI( const InternalCF * const c );
 public:
-    mpz_ptr MPI( const InternalCF * const c );
     STATIC_VAR mpz_t primepow;
     STATIC_VAR mpz_t primepowhalf;