Changeset 508937 in git


Ignore:
Timestamp:
Feb 7, 2007, 7:28:54 PM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
cc4d094c642cb4cc5922f9dae397a524d0b25937
Parents:
89b59f6bb2e4c55ff6effd6ee652ae6444d424aa
Message:
*hannes: map conflict


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

Legend:

Unmodified
Added
Removed

  • Singular/ipshell.h

    r89b59f r508937  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: ipshell.h,v 1.48 2006-09-29 08:44:56 Singular Exp $ */
     6/* $Id: ipshell.h,v 1.49 2007-02-07 18:28:54 Singular Exp $ */
    77/*
    88* ABSTRACT
    … …  
    1010#include <stdio.h>
    1111#include "structs.h"
     12typedef ip_smap *          map;
     13
    1214
    1315extern int  traceit ;

  • Singular/mpsr.h

    r89b59f r508937  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mpsr.h,v 1.23 2006-06-21 17:23:34 Singular Exp $ */
     4/* $Id: mpsr.h,v 1.24 2007-02-07 18:28:54 Singular Exp $ */
    55/***************************************************************
    66 *
    … …  
    2222#include"MPT.h"
    2323#include"structs.h"
     24typedef ip_smap *          map;
    2425#include"subexpr.h"
    2526#include"omalloc.h"

  • kernel/maps.h

    r89b59f r508937  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: maps.h,v 1.1.1.1 2003-10-06 12:15:57 Singular Exp $ */
     6/* $Id: maps.h,v 1.2 2007-02-07 18:28:25 Singular Exp $ */
    77/*
    88* ABSTRACT - the mapping of polynomials to other rings
    99*/
    1010#include "structs.h"
     11typedef ip_smap *          map;
    1112
    1213poly maEval(map theMap, poly p, ring preimage_r, nMapFunc nMap,matrix s=NULL);

  • kernel/structs.h

    r89b59f r508937  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: structs.h,v 1.30 2007-01-31 23:51:25 motsak Exp $ */
     6/* $Id: structs.h,v 1.31 2007-02-07 18:28:25 Singular Exp $ */
    77/*
    88* ABSTRACT
    … …  
    173173typedef poly *             polyset;
    174174typedef ip_sideal *        ideal;
    175 typedef ip_smap *          map;
     175//typedef ip_smap *          map; // conflict with tgb.cc
    176176typedef struct sideal_list *      ideal_list;
    177177typedef ideal *            resolvente;
    … …  
    833833  number        n;
    834834  ideal         uideal;
    835   map           umap;
     835  //map           umap;
     836  ip_smap *     umap;
    836837  matrix        umatrix;
    837838  char *        ustring;
Note: See TracChangeset for help on using the changeset viewer.