Date: Friday, August 17, 2018 @ 10:53:50 Author: arojas Revision: 372474
Update to 4.1.1.p3 Deleted: singular/trunk/singular-ntl-error-handler.patch ----------------------------------+ singular-ntl-error-handler.patch | 72 ------------------------------------- 1 file changed, 72 deletions(-) Deleted: singular-ntl-error-handler.patch =================================================================== --- singular-ntl-error-handler.patch 2018-08-17 10:53:26 UTC (rev 372473) +++ singular-ntl-error-handler.patch 2018-08-17 10:53:50 UTC (rev 372474) @@ -1,72 +0,0 @@ -From 502cf86d0bb2a96715be6764774b64a69c1ca34c Mon Sep 17 00:00:00 2001 -From: Hans Schoenemann <[email protected]> -Date: Wed, 25 Jul 2018 11:03:32 +0200 -Subject: [PATCH] move error handler for factory,NTL to the non-libSingular - part - -(see forum: "NTL error handling", for SAGE) - -diff --git a/Singular/cntrlc.cc b/Singular/cntrlc.cc -index 622495490c..874a5deb79 100644 ---- a/Singular/cntrlc.cc -+++ b/Singular/cntrlc.cc -@@ -20,6 +20,14 @@ - #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 */ - - #define CALL_GDB -@@ -549,11 +557,20 @@ static void stack_trace (char *const*args) - - # 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); - #endif -diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc -index 49eddaae6f..3d5775edd7 100644 ---- a/Singular/misc_ip.cc -+++ b/Singular/misc_ip.cc -@@ -1316,16 +1316,6 @@ static BOOLEAN iiCrossProd(leftv res, leftv args) - On(SW_USE_EZGCD_P); - On(SW_USE_QGCD); - 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; - #ifndef OM_NDEBUG
