Changeset 3772383 in git for kernel

Timestamp:

Dec 13, 2012, 9:28:49 AM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3bfbc700f63b02c4fb904a3529c77a545645d947a915285944d0864527f779e94d2e76ff98d09384

Parents:

7b170f22060e9e52df31c7da5b676af612564fea

Message:

fix: restore options after bba (possible ring change)

Location:

kernel

Files:

• kstd2.cc (modified) (2 diffs)
• polys.cc (modified) (2 diffs)

kernel/kstd2.cc

@@ -1164 +1164 @@
   int hilbeledeg=1,hilbcount=0,minimcnt=0;
   BOOLEAN withT = FALSE;
+  BITSET save;
+  SI_SAVE_OPT1(save);
 
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/
@@ -1466 +1468 @@
 //  }
   if (TEST_OPT_PROT) messageStat(hilbcount,strat);
+  SI_RESTORE_OPT1(save);
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
 

kernel/polys.cc

@@ -13 +13 @@
 void rChangeCurrRing(ring r)
 {
+  #if 0
+  if ((currRing!=NULL)&&(currRing!=r))
+  {
+    currRing->options=si_opt_1 & TEST_RINGDEP_OPTS;
+  }
+  #endif
   if( r != NULL )
   {
@@ -26 +32 @@
     p_SetGlobals(r);
     //------------ global variables related to factory -----------------
-  } else
+  }
+  else
   {
     currRing = NULL;