Changeset ba19a8 in git

Timestamp:

Nov 28, 2014, 1:56:35 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

e1419f3535e85a849df97ea435b49ca0b2caf946

Parents:

b24fe3d2a86019da1031374ed6dc2e954634c05e

Message:

avoid empty procedures - keep Top-namespace clean (a start)

Files:

• Singular/LIB/schreyer.lib (modified) (1 diff)
• Singular/dyn_modules/syzextra/mod_main.cc (modified) (4 diffs)
• libpolys/coeffs/numstats.h (modified) (1 diff)

Singular/LIB/schreyer.lib

@@ -2259 +2259 @@
       exportto(Schreyer, Syzextra::ComputeResolution);
 
-      exportto(Top, Syzextra::NumberStatsInit);
-      exportto(Top, Syzextra::NumberStatsPrint);
-
+      if (defined(NumberStatsInit))
+      {
+        exportto(Top, Syzextra::NumberStatsInit);
+        exportto(Top, Syzextra::NumberStatsPrint);
+      }
       newstruct("SRES","ring r,resolution rsltn"); // http://www.singular.uni-kl.de/Manual/latest/sing_179.htm#SEC218
       newstruct("SSYZ","ring r,module szg"); // http://www.singular.uni-kl.de/Manual/latest/sing_179.htm#SEC218

Singular/dyn_modules/syzextra/mod_main.cc

@@ -1931 +1931 @@
 // no args.
 // init num stats
+#ifdef HAVE_NUMSTATS
 static BOOLEAN _NumberStatsInit(leftv res, leftv h)
 {
@@ -1949 +1950 @@
   return FALSE;
 }
+#endif
 
 // maybe one arg.
 // print num stats
+#ifdef HAVE_NUMSTATS
 static BOOLEAN _NumberStatsPrint(leftv res, leftv h)
 {
@@ -1970 +1973 @@
   return FALSE;
 }
+#endif
 
 END_NAMESPACE
@@ -2029 +2033 @@
 //  ADD("GetAMData", FALSE, GetAMData);
 
+#ifdef HAVE_NUMSTATS
   ADD("NumberStatsInit", FALSE, _NumberStatsInit);
   ADD("NumberStatsPrint", FALSE, _NumberStatsPrint);
+#endif
   
   //  ADD("", FALSE, );

libpolys/coeffs/numstats.h

@@ -124 +124 @@
 #endif
 
+#ifdef HAVE_NUMSTATS
 /// set all counters to zero
 static inline void number_stats_Init(const unsigned long defaultvalue = 0)
 {
-#ifndef HAVE_NUMSTATS
-  WarnS("Please note that number statistic was disabled in compile-time");
-  (void)(defaultvalue);
-#else
   extern struct SNumberStatistic number_stats;
   number_stats.Init(defaultvalue);
+}
 #endif
-}
 
+#ifdef HAVE_NUMSTATS
 /// print out all counters
 static inline void number_stats_Print(const char * const msg = NULL)
 {
-#ifndef HAVE_NUMSTATS
-  Warn("Please note that number statistic was disabled in compile-time [message: %s]", msg);
-#else
   extern struct SNumberStatistic number_stats;
   number_stats.Print(msg);
+}
 #endif
-}
 #endif /* NUMSTAT */