Changeset 456842 in git for libfac/factor/MVMultiHensel.cc

Timestamp:

Aug 8, 2001, 4:26:56 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

8444b045c3217f44893e92cc7acc9a1bc7595178

Parents:

14b1e65b4290df7e1f7dc6b926269dc204ea38a3

Message:

*hannes: Dan's HAVE_SINGULAR_ERROR


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

File:

• libfac/factor/MVMultiHensel.cc (modified) (6 diffs)

libfac/factor/MVMultiHensel.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-// static char * rcsid = "$Id: MVMultiHensel.cc,v 1.5 2001-08-08 11:59:12 Singular Exp $";
+// static char * rcsid = "$Id: MVMultiHensel.cc,v 1.6 2001-08-08 14:26:55 Singular Exp $";
 ///////////////////////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -16 +16 @@
 
 #ifdef SINGULAR
-#  define HAVE_SINGULAR
+#define HAVE_SINGULAR_ERROR
+#endif
+
+#ifdef HAVE_SINGULAR_ERROR
    extern "C" { void WerrorS(char *); }
 #endif
@@ -109 +112 @@
   // Degrees ok? degree(F1,mainvar) + degree(F2,mainvar) <= i ?
   if ( (degree(F1,levelU) + degree(F2,levelU) ) <= i ) {
-#ifdef HAVE_SINGULAR
+#ifdef factor/MVMultiHensel.cc
     WerrorS("libfac: diophant ERROR: degree too large!  ");
 #else
+#ifndef NOSTREAMIO
     cerr << "libfac: diophant ERROR: degree too large!  "
          << (degree(F1,levelU) + degree(F2,levelU) ) <<endl;
+#else
+    ;
+#endif
 #endif
     Retvalue.One=F1;Retvalue.Two=F2;
@@ -123 +130 @@
     // check if gcd(F1,F2) <> 1 , i.e. F1 and F2 are not relatively prime
     if ( ! r.isOne() ){
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
       WerrorS("libfac: diophant ERROR: F1 and F2 are not relatively prime! ");
 #else
@@ -130 +137 @@
            << "  are not relatively prime!" << endl;
 #else
-     cerr << "libfac: diophant ERROR: F1 and F2 are not relatively prime!"
-          << endl;
+     ;
 #endif
 #endif
@@ -405 +411 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.5  2001/08/08 11:59:12  Singular
+*hannes: Dan's NOSTREAMIO changes
+
 Revision 1.4  1997/11/18 16:39:05  Singular
 * hannes: moved WerrorS from C++ to C