Changeset 49abe32 in git for kernel/structs.h


Ignore:
Timestamp:
Apr 27, 2010, 4:17:56 PM (13 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')
Children:
0e051f7f753a1b83c52767ff9ee1a7406bfd8da1
Parents:
82bd705ae7c3ac65c0ab783ad29a7e19bf743bfb
Message:
structs.h simplified

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

Legend:

Unmodified
Added
Removed

  • kernel/structs.h

    r82bd70 r49abe32  
    131131struct sip_link;
    132132struct spolynom;
    133 struct _ssubexpr;
    134 struct _sssym;
    135 struct sip_command;
     133
    136134struct sip_package;
    137 struct s_si_link_extension;
     135typedef struct sip_package ip_package;
     136typedef ip_package *       package;
    138137
    139138// forward for ideals.h:
    … …  
    151150// #endif
    152151
    153 typedef struct _ssubexpr   sSubexpr;
    154 typedef struct _sssym      ssym;
    155152typedef struct spolyrec    polyrec;
    156153typedef struct sip_sring   ip_sring;
    157154typedef struct sip_link    ip_link;
    158 typedef struct sip_command ip_command;
    159 typedef struct sip_package ip_package;
    160155
    161156/* the pointer types */
    … …  
    165160typedef polyrec *          poly;
    166161typedef poly *             polyset;
    167 typedef union uutypes      utypes;
    168 typedef ip_command *       command;
    169 typedef struct s_si_link_extension *si_link_extension;
    170 typedef polyrec *   napoly;
    171162
    172163#ifdef __cplusplus
    … …  
    175166typedef sleftv *           leftv;
    176167typedef slists *           lists;
    177 typedef sSubexpr *         Subexpr;
    178168typedef sattr *            attr;
    179169typedef skStrategy *       kStrategy;
    180 typedef ip_package *       package;
    181170typedef ssyStrategy *      syStrategy;
    182171typedef procinfo *         procinfov;
    … …  
    671660extern struct omBin_s* sleftv_bin;
    672661
    673 #ifdef __cplusplus
    674 union uutypes
    675 {
    676   int           i;
    677   ring          uring;
    678   poly          p;
    679   number        n;
    680   ideal         uideal;
    681   map           umap;
    682   matrix        umatrix;
    683   char *        ustring;
    684   intvec *      iv;
    685   lists         l;
    686   si_link       li;
    687   package       pack;
    688   procinfo *    pinf;
    689 };
    690 
    691 #endif
    692 
    693 #endif
    694 
     662#endif
     663
Note: See TracChangeset for help on using the changeset viewer.