Changeset c232af in git for Singular/structs.h

Timestamp:

Aug 14, 2000, 2:58:28 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

d26c2e9dd38f1531c0e77c38e6177109182b5bca

Parents:

4697a8a1ccbf49d0048033ea29c651e3966ba729

Message:

* omalloc stuff


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

File:

• Singular/structs.h (modified) (7 diffs)

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.31 2000-02-10 16:09:04 Singular Exp $ */
+/* $Id: structs.h,v 1.32 2000-08-14 12:56:52 obachman Exp $ */
 /*
 * ABSTRACT
@@ -76 +76 @@
 struct s_si_link_extension;
 struct reca;
-struct sip_memHeap;
-struct sip_memHeapPage;
 typedef struct _ssubexpr   sSubexpr;
 typedef struct _sssym      ssym;
@@ -88 +86 @@
 typedef struct sip_command ip_command;
 typedef struct sip_package ip_package;
-typedef struct sip_memHeap ip_memHeap;
 
 /* the pointer types */
@@ -107 +104 @@
 typedef struct s_si_link_extension *si_link_extension;
 typedef struct reca *      alg;
-typedef struct sip_memHeap * memHeap;
-typedef struct sip_memHeapPage * memHeapPage;
 
 
@@ -226 +221 @@
 typedef struct sro_syz sro_syz;
 
+#ifndef OM_ALLOC_H
+struct omBin_s;
+#endif
+
 struct sro_ord
 {
@@ -272 +271 @@
 #endif
 
-  memHeap   mm_specHeap; /* Heap from where monoms are allocated */
+  struct omBin_s*   PolyBin; /* Bin from where monoms are allocated */
   short      ch;     /* characteristic */
   short      ch_flags; /* additional char-flags */
@@ -381 +380 @@
 #endif /* HAVE_LIBPARSER */
 
-#if HAVE_ASO == 1
-#include "structs.aso"
-#endif
-
-#endif
-
+extern struct omBin_s* MP_INT_bin;
+extern struct omBin_s* char_ptr_bin;
+extern struct omBin_s* ideal_bin;
+extern struct omBin_s* int_bin;
+extern struct omBin_s* poly_bin;
+extern struct omBin_s* void_ptr_bin;
+extern struct omBin_s* indlist_bin;
+extern struct omBin_s* naIdeal_bin;
+extern struct omBin_s* snaIdeal_bin;
+extern struct omBin_s* sm_prec_bin;
+extern struct omBin_s* smprec_bin;
+extern struct omBin_s* sip_sideal_bin;
+extern struct omBin_s* sip_smap_bin;
+extern struct omBin_s* sip_sring_bin;
+extern struct omBin_s* ip_sideal_bin;
+extern struct omBin_s* ip_smap_bin;
+extern struct omBin_s* ip_sring_bin;
+
+#endif
+