Changeset 9f9b9a1 in git


Ignore:
Timestamp:
Dec 5, 2000, 1:14:33 PM (24 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
f5d749d38c446f41bbcbb94c4d426b74c3fec4ee
Parents:
a5189bc0c3a81e46d3450fdaaeff50a529e8a5b7
Message:
* fixed HAVE_PLURAL stuff


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

Legend:

Unmodified
Added
Removed
  • Singular/pInline2.h

    ra5189b r9f9b9a1  
    77 *  Author:  obachman (Olaf Bachmann)
    88 *  Created: 8/00
    9  *  Version: $Id: pInline2.h,v 1.20 2000-12-01 14:06:31 Singular Exp $
     9 *  Version: $Id: pInline2.h,v 1.21 2000-12-05 12:14:32 obachman Exp $
    1010 *******************************************************************/
    1111#ifndef PINLINE2_H
     
    520520  if (pNext(p) == NULL)
    521521  {
    522 #ifndef HAVE_PLURAL
    523     q = r->p_Procs->p_Mult_mm(q, p, r);
    524 #else /* PLURAL */
    525     q = r->p_Procs->nc_mm_Mult_p(p, q, r);
    526 #endif
     522#ifdef HAVE_PLURAL
     523    if (rIsPluralRing(r))
     524      q = r->p_Procs->nc_mm_Mult_p(p, q, r);
     525    else
     526#endif HAVE_PLURAL
     527      q = r->p_Procs->p_Mult_mm(q, p, r);
     528
    527529    r->p_Procs->p_Delete(&p, r);
    528530    return q;
  • Singular/ring.h

    ra5189b r9f9b9a1  
    77* ABSTRACT - the interpreter related ring operations
    88*/
    9 /* $Id: ring.h,v 1.58 2000-11-25 13:02:44 Singular Exp $ */
     9/* $Id: ring.h,v 1.59 2000-12-05 12:14:33 obachman Exp $ */
    1010
    1111/* includes */
     
    233233BOOLEAN rIsPolyVar(int i, ring r = currRing);
    234234
     235#ifdef HAVE_PLURAL
     236inline BOOLEAN rIsPluralRing(ring r)
     237{
     238  return r->nc != NULL;
     239}
     240#endif
     241
    235242#ifdef RDEBUG
    236243#define rTest(r)    rDBTest(r, __FILE__, __LINE__)
Note: See TracChangeset for help on using the changeset viewer.