Changeset 502cf8 in git

Timestamp:

Jul 25, 2018, 11:03:32 AM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

16137d44693fa5a91cf5f5da79366085c9a15e6f

Parents:

3d752aca5c16f70ac59b285a98ac3cb8664d8656

Message:

move error handler for factory,NTL to the non-libSingular part

(see forum: "NTL error handling", for SAGE)

Files:

• Singular/cntrlc.cc (modified) (2 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• doc/platform.doc (modified) (previous)

Singular/cntrlc.cc

@@ -20 +20 @@
 #include "Singular/links/silink.h"
 #include "Singular/links/ssiLink.h"
+
+#ifdef HAVE_NTL
+#include <NTL/version.h>
+#include <NTL/tools.h>
+#ifdef NTL_CLIENT
+NTL_CLIENT
+#endif
+#endif
 
 /* undef, if you don't want GDB to come up on error */
@@ -550 +558 @@
 #  endif /* !__OPTIMIZE__ */
 
-/*2
-* init signal handlers
-*/
+/// init signal handlers and error handling for libraries: NTL, factory
 void init_signals()
 {
+// 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
+// factory error handling: -----------------------------------------------
+  factoryError=WerrorS;
+
+// signal handler -------------------------------------------------------
   #ifdef SIGSEGV
   si_set_signal(SIGSEGV,(si_hdl_typ)sigsegv_handler);

Singular/misc_ip.cc

@@ -1319 +1319 @@
 void siInit(char *name)
 {
-// factory default settings: -----------------------------------------------
-  //Off(SW_USE_NTL_SORT); // may be changed by an command line option
-  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;