Changeset 69658e in git for kernel/sca.cc

Timestamp:

Feb 22, 2013, 12:29:35 AM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2e2c67897e034b7ffa5b8a0dda72431cff944d4a

Parents:

367df95c40f03bb94a871481eb198951b3a42c85cd4f243f3aafc7080a52fa973f2d90493e4847f2

Message:

Merge pull request #295 from YueRen/warnings

Warnings

File:

• kernel/sca.cc (modified) (3 diffs)

kernel/sca.cc

@@ -375 +375 @@
 
 // Under development!!!
-ideal sca_bba (const ideal F, const ideal Q, const intvec *w, const intvec * /*hilb*/, kStrategy strat, const ring _currRing)
+ideal sca_bba (const ideal F, const ideal Q, const intvec */*w*/, const intvec * /*hilb*/, kStrategy strat, const ring _currRing)
 {
   const ring save = currRing;
@@ -867 +867 @@
 
 // returns TRUE if mora should use buckets, false otherwise
+#ifdef MORA_USE_BUCKETS
 static BOOLEAN kMoraUseBucket(kStrategy strat)
+#else
+static BOOLEAN kMoraUseBucket(kStrategy)
+#endif
 {
 #ifdef MORA_USE_BUCKETS
@@ -898 +902 @@
 
 // ideal sca_mora (ideal F, ideal Q, intvec *w, intvec *, kStrategy strat)
-ideal sca_mora(const ideal F, const ideal Q, const intvec *w, const intvec *, kStrategy strat, const ring _currRing)
+ideal sca_mora(const ideal F, const ideal Q, const intvec */*w*/, const intvec *, kStrategy strat, const ring _currRing)
 {
   const ring save = currRing;