Changeset 6fcb1b3 in git

Timestamp:

Feb 23, 2012, 11:00:04 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

7347dfb614641b54c125074951559ca8b65b5ea3

Parents:

1a9dc5ff3e8396b7eb0f03fb0ee57fdcae4a5c74

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-23 23:00:04+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-24 16:11:23+01:00

Message:

fixing 32bit via 64bit issues

fix: removed typedef for long64 from ring.h as it duplicates the same block in auxiliary.h!

TODO: fixing mylimits.h leads to lots of errors in runtime (ring:bitmask gets -1L!!?)

Location:

libpolys

Files:

• misc/Makefile.am (modified) (1 diff)
• misc/mylimits.h (modified) (1 diff)
• polys/monomials/ring.cc (modified) (1 diff)
• polys/monomials/ring.h (modified) (1 diff)

libpolys/misc/Makefile.am

@@ -22 +22 @@
 
 libmisc_includedir = $(includedir)/singular/misc
-libmisc_include_HEADERS = mylimits.h options.h intvec.h int64vec.h auxiliary.h
+libmisc_include_HEADERS = mylimits.h options.h intvec.h int64vec.h
+nodist_libmisc_include_HEADERS = auxiliary.h 
 
 nodist_libmisc_la_SOURCES   = auxiliary.h 

libpolys/misc/mylimits.h

@@ -21 +21 @@
 
 
+// #define ULONG_MAX (~0UL) // ??
 #define ULONG_MAX (~0L)
 
+// TODO: fixing the following BUG (!?) leads to wrong ring::bitmask
+// #if ~0UL != 4294967295UL
 #if ~0UL == 4294967295UL
 #define LONG_MAX 9223372036854775807L

libpolys/polys/monomials/ring.cc

@@ -11 +11 @@
 #include <math.h>
 
+#include "config.h"
+
 #include <omalloc/omalloc.h>
+
+#include <misc/auxiliary.h>
+#include <misc/mylimits.h>
 #include <misc/options.h>
 #include <misc/int64vec.h>

libpolys/polys/monomials/ring.h

@@ -37 +37 @@
 struct sip_smap;
 typedef struct sip_smap *         map;
-
-
-#if SIZEOF_LONG == 4
-typedef long long int64;
-#elif SIZEOF_LONG == 8
-typedef long int64;
-#else
-#error int64 undefined
-#endif
 
 /* the function pointer types */