Changeset e6f1e6 in git for kernel/GBEngine/kInline.h

Timestamp:

May 17, 2016, 5:26:29 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

6f203b6a99801e807e56ef784f79d4951204b9e5

Parents:

f8fb93d1bc922d1e97207d1d5b347fe1db1eedcf

Message:

code cleanup: HAVE_RINGS is mostly not needed

File:

• kernel/GBEngine/kInline.h (modified) (1 diff)

kernel/GBEngine/kInline.h

@@ -1144 +1144 @@
   assume(p_sev == pGetShortExpVector(p));
   if (strat->noClearS) return;
-  #if HAVE_RINGS
-    if(rField_is_Ring(currRing))
-    {
-        if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at]))
-            return;
-        if(!n_DivBy(pGetCoeff(strat->S[*at]), pGetCoeff(p), currRing))
-            return;
-    }
-    else
-    {
-        if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at])) return;
-    }
-  #else
+  if(rField_is_Ring(currRing))
+  {
+    if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at]))
+      return;
+    if(!n_DivBy(pGetCoeff(strat->S[*at]), pGetCoeff(p), currRing))
+      return;
+  }
+  else
+  {
     if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at])) return;
-  #endif
+  }
   deleteInS((*at),strat);
   (*at)--;