Changeset a41f4b6 in git

Timestamp:

Nov 9, 2010, 11:12:51 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ba3e3ef698fa0b7c5867199959cc83330073d3cb')

Children:

3a28ffd8f74584ab2ed394ff3d3c22bb6670fa61

Parents:

fbbb08becdc8fd9fbb911c8b7b74de5c2f52d7ad

Message:

factoryError, factoryError_callback

git-svn-id: file:///usr/local/Singular/svn/trunk@13611 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

• cf_char.cc (modified) (2 diffs)
• cf_util.cc (modified) (1 diff)
• cf_util.h (modified) (1 diff)

factory/cf_char.cc

@@ -12 +12 @@
 #include "cf_primes.h"
 #include "cf_binom.h"
+#include "cf_util.h"
 #ifdef SINGULAR
-#include "singext.h"
+//#include "singext.h"
 #endif
 
@@ -40 +41 @@
         theCharacteristic = c;
         ff_big = c > cf_getSmallPrime( cf_getNumSmallPrimes()-1 );
-#ifdef SINGULAR
-        if (!errorreported && (c > 536870909)) Werror("characteristic %d is too large(max is 2^29)",c);
-#endif
+        if (c > 536870909) factoryError("characteristic is too large(max is 2^29)");
         ff_setprime( c );
         resetFPT();

factory/cf_util.cc

@@ -47 +47 @@
   return n;
 }
+
+#include<stdio.h>
+
+void (*factoryError_callback)(const char *s) = 0;
+
+void factoryError(const char *s)
+{
+  if (factoryError_callback!=0) factoryError_callback(s);
+  else fprintf(stderr,s);
+}
+

factory/cf_util.h

@@ -16 +16 @@
 int ilog2 (int a);
 
+extern void (*factoryError_callback)(const char *s);
+
+void factoryError(const char *s);
 
 #endif /* ! INCL_CF_UTIL_H */