Changeset a7575a1 in git

Timestamp:

Nov 30, 2014, 6:06:19 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

78337a8ca92062c661a4ecbf7723e1ef6ed46494

Parents:

73ba505b3214e1ee60c9a3ad8af9475b7e753666

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-30 18:06:19+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-30 18:22:50+01:00

Message:

Revert "avoid empty procedures - keep Top-namespace clean (a start)" in order to keep stable interface

This reverts commit ba19a8a94da4931a7c4fb8ea6bc91256251c15ec.
+ minor changes : no export to Top

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);
 
-      if (defined(NumberStatsInit))
-      {
-        exportto(Top, Syzextra::NumberStatsInit);
-        exportto(Top, Syzextra::NumberStatsPrint);
-      }
+      exportto(Schreyer, Syzextra::NumberStatsInit);
+      exportto(Schreyer, 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)
 {
@@ -1950 +1949 @@
   return FALSE;
 }
-#endif
 
 // maybe one arg.
 // print num stats
-#ifdef HAVE_NUMSTATS
 static BOOLEAN _NumberStatsPrint(leftv res, leftv h)
 {
@@ -1973 +1970 @@
   return FALSE;
 }
-#endif
 
 END_NAMESPACE
@@ -2033 +2029 @@
 //  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
 }
-#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
 #endif /* NUMSTAT */