Changeset a2cdd62 in git

Timestamp:

Nov 15, 2011, 7:28:26 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7d58b610fedb008c184de5ef38c1cd5bc05d1ecc

Parents:

4e855a74192517a72dcb8d0b593d1a3706ed88d9

Message:

fix: avoid limits.h

Files:

• Singular/walk.cc (modified) (1 diff)
• kernel/semic.cc (modified) (2 diffs)
• libpolys/coeffs/ffields.cc (modified) (1 diff)
• libpolys/coeffs/shortfl.cc (modified) (1 diff)
• libpolys/misc/mylimits.h (modified) (1 diff)
• libpolys/polys/matpol.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Singular/walk.cc

@@ -43 +43 @@
 #include <stdio.h>
 #include <float.h>
-#include <limits.h>
+#include <misc/mylimits.h>
 #include <sys/types.h>
 

kernel/semic.cc

@@ -413 +413 @@
     Rational alpha2 = -1;
 
-    int      mult=INT_MAX,nthis,nt;
+    int      mult=MAX_INT_VAL,nthis,nt;
 
     while( u.next_interval( &alpha1,&alpha2 ) )
@@ -442 +442 @@
     Rational alpha2 = -1;
 
-    int      mult=INT_MAX,nthis,nt;
+    int      mult=MAX_INT_VAL,nthis,nt;
 
     while( u.next_interval( &alpha1,&alpha2 ) )

libpolys/coeffs/ffields.cc

@@ -464 +464 @@
       *i *= 10;
       *i += *s++ - '0';
-      if (*i > (INT_MAX / 10)) *i = *i % r->m_nfCharP;
+      if (*i > (MAX_INT_VAL / 10)) *i = *i % r->m_nfCharP;
     }
     while (*s >= '0' && *s <= '9');

libpolys/coeffs/shortfl.cc

@@ -88 +88 @@
   int i;
   float f = nf(n).F();
-  if (((float)INT_MIN <= f) || ((float)INT_MAX >= f))
+  if (((float)(-MAX_INT_VAL-1) <= f) || ((float)MAX_INT_VAL >= f))
     i = (int)f;
   else

libpolys/misc/mylimits.h

@@ -10 +10 @@
 #define _MYLIMITS_H
 
-#include <limits.h>
+static const int MAX_INT_VAL = 2147483647;
 
-static const int MAX_INT_VAL = INT_MAX;
+#define ULONG_MAX (~0L)
+
+#if ~0UL == 4294967295UL
+#define LONG_MAX 9223372036854775807L
+#else
+#define LONG_MAX 2147483647L
+#endif
 
 #endif /* _MYLIMITS_H */

libpolys/polys/matpol.cc

@@ -48 +48 @@
 {
   if (r<=0) r=1;
-  if ( (((int)(INT_MAX/sizeof(poly))) / r) <= c)
+  if ( (((int)(MAX_INT_VAL/sizeof(poly))) / r) <= c)
   {
     Werror("internal error: creating matrix[%d][%d]",r,c);

libpolys/polys/monomials/ring.cc

@@ -3804 +3804 @@
 static void rSetVarL(ring r)
 {
-  int  min = INT_MAX, min_j = -1;
+  int  min = MAX_INT_VAL, min_j = -1;
   int* VarL_Number = (int*) omAlloc0(r->ExpL_Size*sizeof(int));