Changeset 71e0a9 in git

Timestamp:

Jan 30, 2015, 6:43:16 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

abf7a566d48e0732b9f8804b5741a25a8e6cea89d6adbbd9215167e0e346605ee97f2d43fbe1a358

Parents:

10e299defc5ae0c54c970239c42f261ddbfaa5d4

Message:

removed HAVE_RINGS_LOC: is part of HAVE_RINGS

Files:

• dox/Doxyfile.in (modified) (1 diff)
• kernel/GBEngine/kstd1.cc (modified) (2 diffs)
• kernel/GBEngine/kutil.cc (modified) (3 diffs)

dox/Doxyfile.in

@@ -2027 +2027 @@
 HAVE_RATGRING \
 HAVE_RING2TOM \
-HAVE_RINGS_LOC \
 HAVE_SBRK \
 HAVE_SDB \

kernel/GBEngine/kstd1.cc

@@ -1348 +1348 @@
     strat->red2 = redHomog;
   }
-#if defined(HAVE_RINGS) || defined(HAVE_RINGS_LOC)  //TODO Oliver
+#if defined(HAVE_RINGS)
   if (rField_is_Ring(currRing))
   {
@@ -1688 +1688 @@
       // clear strat->P
       if (strat->P.lcm!=NULL)
-#if defined(HAVE_RINGS) || defined(HAVE_RINGS_LOC)
+#if defined(HAVE_RINGS)
         pLmDelete(strat->P.lcm);
 #else

kernel/GBEngine/kutil.cc

@@ -339 +339 @@
 #endif
 
-#ifdef HAVE_RINGS_LOC
+#ifdef HAVE_RINGS
   // Leading coef have to be a unit
   if ( !(nIsUnit(p_GetCoeff(p, r))) ) return;
@@ -6542 +6542 @@
   if (!pIsVector((*p).p) && ((*p).ecart != 0))
   {
-#ifdef HAVE_RINGS_LOC
+#ifdef HAVE_RINGS
     // Leading coef have to be a unit
     if ( !(nIsUnit(p_GetCoeff((*p).p, r))) ) return;
@@ -6557 +6557 @@
         (*p).ecart = 0;
         (*p).length = 1;
-#ifdef HAVE_RINGS_LOC
-        (*p).pLength = 1;  // Why wasn't this set already?
-#endif
+        (*p).pLength = 1;
         (*suc)=0;
         return;