Changeset ba8c0b in git

Timestamp:

Jan 10, 2000, 7:59:34 PM (23 years ago)

Author:

Moritz Wenk <wenk@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

7b309413ac65df3eb20dbda746a69598a7a8c2c8

Parents:

e503d6c4e508e3cb10f9f107011a9deb527fd629

Message:

wenk: now works without HAVE_FACTORY defined.


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

Location:

Singular

Files:

• mpr_base.cc (modified) (5 diffs)
• mpr_global.h (modified) (2 diffs)

Singular/mpr_base.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_base.cc,v 1.16 1999-12-02 23:03:49 wenk Exp $ */
+/* $Id: mpr_base.cc,v 1.17 2000-01-10 18:59:34 wenk Exp $ */
 
 /*
@@ -28 +28 @@
 #ifdef HAVE_FACTORY
 #include "clapsing.h"
-#else
-#include "matpol.h"
 #endif
 #include "sparsmat.h"
@@ -2526 +2524 @@
 
   // evaluate determinant of matrix m using factory singclap_det
+#ifdef HAVE_FACTORY
   poly res= singclap_det( m );
+#else
+  poly res= NULL;
+#endif
 
   // avoid errors for det==0
@@ -2586 +2588 @@
   }
 
+#ifdef HAVE_FACTORY
   poly res= singclap_det( mat );
+#else
+  poly res= NULL;
+#endif
 
   number numres;
@@ -2655 +2661 @@
     break;
   case denseResMat:
+#ifdef HAVE_FACTORY
     resMat= new resMatrixDense( gls );
     break;
+#endif
   default:
     WerrorS("uResultant::uResultant: Unknown resultant matrix type choosen!");

Singular/mpr_global.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_global.h,v 1.9 1999-12-02 23:03:50 wenk Exp $ */
+/* $Id: mpr_global.h,v 1.10 2000-01-10 18:59:34 wenk Exp $ */
 
 /*
@@ -53 +53 @@
 #endif
 
-#ifdef mprDEBUG_STICKY
+#if defined(mprDEBUG_STICKY) && defined(HAVE_FACTORY)
 // call 'option(prot);' to get status informations
 #define mprSTICKYPROT(msg) if (BTEST1(OPT_PROT)) Print(msg)