Changeset 41bcd7 in git

Timestamp:

Apr 8, 1998, 3:18:18 PM (25 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

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

Children:

af191b958ee3fe3243b1c9364cbf7700930e02ba

Parents:

b994f697e8945275c9cdcc48299751c3a7c02a1a

Message:

substitute macintosh by __MWERKS__


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

File:

• Singular/claptmpl.cc (modified) (6 diffs)

Singular/claptmpl.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: claptmpl.cc,v 1.13 1998-04-06 12:24:19 schmidt Exp $
+// $Id: claptmpl.cc,v 1.14 1998-04-08 13:18:18 pohl Exp $
 /*
 * ABSTRACT - instantiation of all templates
@@ -16 +16 @@
 
 #if defined(HAVE_FACTORY) || defined(HAVE_FGLM)
-  #ifdef macintosh
-    #include <:templates:ftmpl_list.cc>
-  #else
-    #include <templates/ftmpl_list.cc>
-  #endif
-
+  #include <templates/ftmpl_list.cc>
   #ifdef HAVE_FGLM
     #include "fglm.h"
@@ -27 +22 @@
 
   #ifdef HAVE_FACTORY
-    #ifdef macintosh
-      #include <:templates:ftmpl_array.cc>
-      #include <:templates:ftmpl_factor.cc>
-      #include <:templates:ftmpl_functions.h>
-      #include <:templates:ftmpl_matrix.cc>
+    #include <templates/ftmpl_array.cc>
+    #include <templates/ftmpl_factor.cc>
+    #include <templates/ftmpl_functions.h>
+    #include <templates/ftmpl_matrix.cc>
+    #ifdef __MWERKS__
       template List<CanonicalForm> Difference<CanonicalForm>(const List<CanonicalForm>&,const List<CanonicalForm>&);
       template List<CanonicalForm> Union<CanonicalForm>(const List<CanonicalForm>&,const List<CanonicalForm>&);
@@ -37 +32 @@
       template List<Variable> Union<Variable> ( const List<Variable>&, const List<Variable>& );
       template List<Variable> Difference<Variable> ( const List<Variable>&, const List<Variable>& );
-    #else
-      #include <templates/ftmpl_array.cc>
-      #include <templates/ftmpl_factor.cc>
-      #include <templates/ftmpl_functions.h>
-      #include <templates/ftmpl_matrix.cc>
     #endif
 
@@ -59 +49 @@
     template class Array<REvaluation>;
 
-    #ifndef macintosh
+    #ifndef __MWERKS__
       template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
 
@@ -134 +124 @@
     template class ListIterator<Variable> ;
 
-    #ifndef macintosh
+    #ifndef __MWERKS__
       template List<Variable> Union ( const List<Variable>&, const List<Variable>& );
       template List<Variable> Difference ( const List<Variable>&, const List<Variable>& );