Changeset a07784 in git for Singular/Minor.cc

Timestamp:

Dec 5, 2012, 4:03:45 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ae900ff750a6fe0dbab70a5aa87cc48fc3dd280e

Parents:

b3646035aca6a8d660df952d443268649a51090907ff965ddd552fe3a981f417b2da928dca53a8f2

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese-pyobject

File:

• Singular/Minor.cc (modified) (15 diffs)

Singular/Minor.cc

@@ -1 @@
-#include <iostream>
-
 #include "config.h"
 #include <kernel/mod2.h>
+
+#include "Minor.h"
+
 #include <kernel/structs.h>
 #include <kernel/polys.h>
-#include <Minor.h>
 #include <kernel/febase.h>
 
+using namespace std;
 
 void MinorKey::reset()
@@ -114 +115 @@
 void MinorKey::print() const
 {
-  cout << this->toString();
+  PrintS(this->toString().c_str());
 }
 
@@ -145 +146 @@
   }
   /* We should never reach this line of code. */
-  assert(false);
+  assume(false);
 }
 
@@ -176 +177 @@
   }
   /* We should never reach this line of code. */
-  assert(false);
+  assume(false);
 }
 
@@ -198 +199 @@
     }
   }
-  return;
 }
 
@@ -220 +220 @@
     }
   }
-  return;
 }
 
@@ -251 +250 @@
   }
   /* We should never reach this line of code. */
-  assert(false);
+  assume(false);
 }
 
@@ -282 +281 @@
   }
   /* We should never reach this line of code. */
-  assert(false);
+  assume(false);
 }
 
@@ -439 +438 @@
 bool MinorKey::operator==(const MinorKey& mk) const
 {
-  assert(false);
+  assume(false);
   return this->compare(mk) == 0;
 }
@@ -447 +446 @@
 bool MinorKey::operator<(const MinorKey& mk) const
 {
-  assert(false);
+  assume(false);
   return this->compare(mk) == -1;
 }
@@ -833 +832 @@
 int MinorValue::getWeight () const
 {
-  assert(false);  /* must be overridden in derived classes */
+  assume(false);  /* must be overridden in derived classes */
   return 0;
 }
@@ -841 +840 @@
 bool MinorValue::operator==(const MinorValue& mv) const
 {
-  assert(false);
+  assume(false);
   return (this == &mv);  /* compare addresses of both objects */
 }
@@ -847 +846 @@
 string MinorValue::toString () const
 {
-  assert(false);  /* must be overridden in derived classes */
+  assume(false);  /* must be overridden in derived classes */
   return "";
 }
@@ -855 +854 @@
 bool MinorValue::operator<(const MinorValue& mv) const
 {
-  assert(false);
+  assume(false);
   return (this < &mv);  /* compare addresses of both objects */
 }
@@ -896 +895 @@
 void MinorValue::print() const
 {
-  cout << this->toString();
+  PrintS(this->toString().c_str());
 }