Changeset 8444b0 in git

Timestamp:

Aug 8, 2001, 4:27:38 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

1ac173caaa52482213be39480214765a2e70eb5f

Parents:

456842ed1cd4bb0af35f859e0befe623c3991393

Message:

*hannes: Dan's HAVE_SINGULAR_ERROR


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

Location:

libfac/factor

Files:

• SqrFree.cc (modified) (3 diffs)
• Truefactor.cc (modified) (5 diffs)

libfac/factor/SqrFree.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-static char * rcsid = "$Id: SqrFree.cc,v 1.6 2001-08-08 14:26:56 Singular Exp $";
+static char * rcsid = "$Id: SqrFree.cc,v 1.7 2001-08-08 14:27:38 Singular Exp $";
 static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de .\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -262 +262 @@
   WerrorS("libfac: ERROR: SqrFreed: we should never fall trough here!");
 #else
-#infdef NOSTREAMIO
+#ifndef NOSTREAMIO
   cerr << "\nlibfac: ERROR: SqrFreed: we should never fall trough here!\n"
        << rcsid << errmsg << endl;
@@ -341 +341 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.6  2001/08/08 14:26:56  Singular
+*hannes: Dan's HAVE_SINGULAR_ERROR
+
 Revision 1.5  2001/08/08 11:59:13  Singular
 *hannes: Dan's NOSTREAMIO changes

libfac/factor/Truefactor.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-//static char * rcsid = "@(#) $Id: Truefactor.cc,v 1.8 2001-08-08 11:59:13 Singular Exp $";
+//static char * rcsid = "@(#) $Id: Truefactor.cc,v 1.9 2001-08-08 14:26:56 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
@@ -356 +359 @@
     int n=2;
     if ( PossibleFactors.length() < n ) { // a little check
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
       WerrorS("libfac: ERROR: TakeNorms less then two items remaining!");
 #else
+#ifndef NOSTREAMIO
       cerr << "libfac: ERROR: TakeNorms less then two items remaining! "
            << endl;
+#else
+      ;
+#endif
 #endif
     }
@@ -398 +405 @@
       }
       else{
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
         WerrorS("libfac: TakeNorms: somethings wrong with remaining factors!");
 #else
+#ifndef NOSTREAMIO
         cerr << "libfac: TakeNorms: somethings wrong with remaining factors!"
              << endl;
+#endif
 #endif
       }
@@ -413 +422 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.8  2001/08/08 11:59:13  Singular
+*hannes: Dan's NOSTREAMIO changes
+
 Revision 1.7  2001/08/06 08:32:54  Singular
 * hannes: code cleanup