Changeset 508937 in git for kernel/structs.h

Timestamp:

Feb 7, 2007, 7:28:54 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cc4d094c642cb4cc5922f9dae397a524d0b25937

Parents:

89b59f6bb2e4c55ff6effd6ee652ae6444d424aa

Message:

*hannes: map conflict


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

File:

• kernel/structs.h (modified) (3 diffs)

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.30 2007-01-31 23:51:25 motsak Exp $ */
+/* $Id: structs.h,v 1.31 2007-02-07 18:28:25 Singular Exp $ */
 /*
 * ABSTRACT
@@ -173 +173 @@
 typedef poly *             polyset;
 typedef ip_sideal *        ideal;
-typedef ip_smap *          map;
+//typedef ip_smap *          map; // conflict with tgb.cc
 typedef struct sideal_list *      ideal_list;
 typedef ideal *            resolvente;
@@ -833 +833 @@
   number        n;
   ideal         uideal;
-  map           umap;
+  //map           umap;
+  ip_smap *     umap;
   matrix        umatrix;
   char *        ustring;