Changeset d6c852 in git

Timestamp:

Jul 6, 2020, 10:46:08 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

2ca80a7735f57cf908060cfb800bfa302c2afc8f

Parents:

9e20b9f7749f3bf1b809cdfca51f8fdbbc25e754f8d27e1651a82b4063c80d3de252b7aee270308f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-07-06 10:46:08+02:00

git-committer:

GitHub <noreply@github.com>2020-07-06 10:46:08+02:00

Message:

Merge pull request #1015 from fingolfin/mh/fix-testsuite

Move FLINTrandom into factory to fix test suite crashes

Files:

• Singular/misc_ip.cc (modified) (2 diffs)
• factory/cf_random.cc (modified) (2 diffs)

Singular/misc_ip.cc

@@ -1328 +1328 @@
 * initialize components of Singular
 */
-#ifdef HAVE_FLINT
-extern "C" 
-{
-GLOBAL_VAR flint_rand_t FLINTrandom;
-}
-#endif
-
 void siInit(char *name)
 {
@@ -1397 +1390 @@
   siRandomStart=t;
   feOptSpec[FE_OPT_RANDOM].value = (void*) ((long)siRandomStart);
-  #ifdef HAVE_FLINT
-  flint_randinit(FLINTrandom);
-  #endif
 
 // ressource table: ----------------------------------------------------

factory/cf_random.cc

@@ -14 +14 @@
 #include "gfops.h"
 #include "imm.h"
+
+#ifdef HAVE_FLINT
+extern "C"
+{
+#ifndef __GMP_BITS_PER_MP_LIMB
+#define __GMP_BITS_PER_MP_LIMB GMP_LIMB_BITS
+#endif
+#include <flint/flint.h>
+
+GLOBAL_VAR flint_rand_t FLINTrandom;
+}
+#endif
 
 class RandomGenerator {
@@ -174 +186 @@
 }
 
+
 void factoryseed ( int s )
 {
     ranGen.seed( s );
+
+#ifdef HAVE_FLINT
+    flint_randinit(FLINTrandom);
+#endif
 }