Changeset 28d883 in git

Timestamp:

Nov 30, 2017, 12:09:04 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c3abfcce79c48aa77ab7c235621197ecdc8c09d8

Parents:

15dc7b449e9b4c3ab9681e7ab8d56bd02393e621

Message:

add error handling of NTL (>=9.3.0)

Files:

• Singular/misc_ip.cc (modified) (2 diffs)
• factory/int_cf.h (modified) (1 diff)
• kernel/mod2.h (modified) (1 diff)
• kernel/structs.h (modified) (1 diff)

Singular/misc_ip.cc

@@ -72 +72 @@
   #endif
 #endif
+
+#ifdef HAVE_NTL
+#include<NTL/version.h>
+#include<NTL/tools.h>
+#ifdef NTL_CLIENT
+NTL_CLIENT
+#endif
+#endif
+
 
 static FORCE_INLINE void number2mpz(number n, mpz_t m){ number2mpz(n, coeffs_BIGINT, m); }
@@ -1303 +1312 @@
   factoryError=WerrorS;
 
+// NTL error handling (>= 9.3.0)
+#ifdef HAVE_NTL
+#if (((NTL_MAJOR_VERSION==9)&&(NTL_MINOR_VERSION>=3))||(NTL_MAJOR_VERSION>=10))
+  ErrorMsgCallback=WerrorS;
+  ErrorCallback=HALT;
+#endif
+#endif
+
 // memory initialization: -----------------------------------------------
     om_Opts.OutOfMemoryFunc = omSingOutOfMemoryFunc;

factory/int_cf.h

@@ -52 +52 @@
     InternalCF( const InternalCF& )
     {
-        ASSERT( 0, "ups there is something wrong in your code");
+        ASSERT( 0, "ups there is something wrong in your code");
     };
     virtual ~InternalCF() {};

kernel/mod2.h

@@ -117 +117 @@
 #endif
 
-#define HALT() m2_end(2)
+#ifdef __cplusplus
+extern "C" {
+#endif
+void  m2_end(int i);
+#ifdef __cplusplus
+}
+#endif
+
+static inline void HALT() { m2_end(2);}
 
 /* define OLD_RES for res/sres/mres(i,j,k) */

kernel/structs.h

@@ -76 +76 @@
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-void  m2_end(int i);
-#ifdef __cplusplus
-}
-#endif
-
 #define loop for(;;)