Changeset e3cab3 in git

Timestamp:

Apr 8, 1998, 2:14:07 PM (25 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

41e149d29e021987bb189509b26919708bad6e45

Parents:

99cfcba795ebe458e864dea1374dafda993d2601

Message:

substitute macintosh by __MWERKS__


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

Location:

Singular

Files:

• fglmcomb.cc (modified) (5 diffs)
• fglmgauss.cc (modified) (3 diffs)
• fglmvec.cc (modified) (2 diffs)
• fglmvec.h (modified) (2 diffs)
• fglmzero.cc (modified) (12 diffs)

Singular/fglmcomb.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmcomb.cc,v 1.8 1998-03-27 14:21:29 Singular Exp $
+// $Id: fglmcomb.cc,v 1.9 1998-04-08 12:11:24 pohl Exp $
 
 /****************************************
@@ -31 +31 @@
 #include "kstd1.h"
 #include "fglm.h"
-#ifdef macintosh
-#include <:templates:ftmpl_list.h>
-#else
 #include <templates/ftmpl_list.h>
-#endif
 
 // nur fuer debug-Ausgaben:
@@ -264 +260 @@
         }
         nf[k]= current;
-#ifdef macintosh
+#ifdef __MWERKS__
         mv[k].mac_constr( currV );
 #else
@@ -275 +271 @@
         STICKYPROT( "." );
  
-#ifdef macintosh
+#ifdef __MWERKS__
         v[k].mac_constr_i( basisSize );
 #else
@@ -476 +472 @@
     STICKYPROT2( "(%i)", basisSize );
     for ( k= 0; k < numMonoms; k++ ) {
-#ifdef macintosh
+#ifdef __MWERKS__
         v[k].mac_constr_i( basisSize );
 #else

Singular/fglmgauss.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmgauss.cc,v 1.5 1998-01-27 16:47:29 pohl Exp $
+// $Id: fglmgauss.cc,v 1.6 1998-04-08 12:12:43 pohl Exp $
 
 /****************************************
@@ -32 +32 @@
         newfac= NULL;
     }
-#ifdef macintosh
+#ifdef __MWERKS__
     void mac_gaussElem( const fglmVector newv, const fglmVector newp, number & newpdenom, number & newfac )
     {
@@ -170 +170 @@
     
     pivot= nCopy( v.getconstelem( pivotcol ) );
-#ifdef macintosh
+#ifdef __MWERKS__
     elems[size].mac_gaussElem( v, p, pdenom, pivot );
 #else

Singular/fglmvec.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmvec.cc,v 1.6 1998-01-27 14:25:29 pohl Exp $
+// $Id: fglmvec.cc,v 1.7 1998-04-08 12:13:21 pohl Exp $
 
 /****************************************
@@ -143 +143 @@
         delete rep;
 }
-#ifdef macintosh
+#ifdef __MWERKS__
 void
 fglmVector::mac_constr( const fglmVector & v)

Singular/fglmvec.h

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmvec.h,v 1.4 1998-01-27 14:25:28 pohl Exp $
+// $Id: fglmvec.h,v 1.5 1998-04-08 12:12:04 pohl Exp $
 
 /****************************************
@@ -30 +30 @@
     fglmVector( const fglmVector & v );
     ~fglmVector();
-#ifdef macintosh
+#ifdef __MWERKS__
     void mac_constr( const fglmVector & v);
     void mac_constr_i( int size);

Singular/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.12 1998-01-27 14:49:15 pohl Exp $
+// $Id: fglmzero.cc,v 1.13 1998-04-08 12:14:07 pohl Exp $
 
 /****************************************
@@ -36 +36 @@
 // assumes, that NOSTREAMIO is set in factoryconf.h, which is included
 // by templates/list.h. 
-#ifdef macintosh
-#include <:templates:ftmpl_list.h>
-#else
 #include <templates/ftmpl_list.h>
-#endif
 #define PROT(msg)
 #define STICKYPROT(msg) if (BTEST1(OPT_PROT)) Print(msg)
@@ -295 +291 @@
     borderElem( poly p, fglmVector n ) : monom( p ), nf( n ) {}
     ~borderElem() { pDelete1( &monom ); }
-#ifdef macintosh
+#ifdef __MWERKS__
     void insertElem( poly p, fglmVector n ) 
     {
@@ -374 +370 @@
     borderMax= borderBS;
     borderSize= 0;
-#ifdef macintosh
+#ifdef __MWERKS__
     border= new borderElem[ borderMax ];
 #else
@@ -388 +384 @@
         pDelete1( basis + k );  //. rem: basis runs from basis[1]..basis[basisSize]
     Free( (ADDRESS)basis, basisMax*sizeof( poly ) );
-#ifdef macintosh
+#ifdef __MWERKS__
     delete [] border;
 #else
@@ -424 +420 @@
     borderSize++;
     if ( borderSize == borderMax ) {
-#ifdef macintosh
+#ifdef __MWERKS__
         borderElem * tempborder = new borderElem[ borderMax+borderBS ];
         for ( int k = 0; k < borderMax; k++ ) {
@@ -437 +433 @@
         borderMax+= borderBS;
     }
-#ifdef macintosh
+#ifdef __MWERKS__
     border[borderSize].insertElem( m, v );
 #else
@@ -678 +674 @@
     number fac;
 
-#ifdef macintosh
+#ifdef __MWERKS__
     oldGaussElem() : v(), p(), pdenom( NULL ), fac( NULL ) {}
 #endif
@@ -687 +683 @@
     }
     ~oldGaussElem();
-#ifdef macintosh
+#ifdef __MWERKS__
     void insertElem( const fglmVector newv, const fglmVector newp, number & newpdenom, number & newfac ) 
     {
@@ -746 +742 @@
     basisSize= 0;
     //. All arrays run from [1]..[dimen], thus Alloc( dimen + 1 )!
-#ifdef macintosh
+#ifdef __MWERKS__
     gauss= new oldGaussElem[ dimen+1 ];
 #else
@@ -764 +760 @@
     fglmASSERT( dimen == basisSize, "Es wurden nicht alle BasisElemente gefunden!" );
     int k;
-#ifdef macintosh
+#ifdef __MWERKS__
     delete [] gauss;
 #else
@@ -817 +813 @@
     
     pivot= nCopy( v.getconstelem( pivotcol ) );
-#ifdef macintosh
+#ifdef __MWERKS__
     gauss[basisSize].insertElem( v, p, denom, pivot );
 #else