merge with m5 head

--HG--
extra : convert_revision : c90339248d1ee74df1c6b90a77ec9ea41f646311

1 files changed, 6 insertions, 11 deletions

diff --git a/base/statistics.hh b/base/statistics.hh
index d8b78fbff..0dad31a5a 100644
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -60,12 +60,6 @@
 #include "base/str.hh"
 #include "sim/host.hh"
 
-//
-//  Un-comment this to enable weirdo-stat debugging
-//
-// #define STAT_DEBUG
-
-
 #ifndef NAN
 float __nan();
 /** Define Not a number. */
@@ -146,10 +140,7 @@ struct StatData
     /** A pointer to a prerequisite Stat. */
     const StatData *prereq;
 
-    StatData()
-        : flags(none), precision(-1), prereq(0)
-    {}
-
+    StatData();
     virtual ~StatData();
 
     /**
@@ -193,6 +184,10 @@ struct StatData
      * @return stat1's name is alphabetically before stat2's
      */
     static bool less(StatData *stat1, StatData *stat2);
+
+#ifdef DEBUG
+    int number;
+#endif
 };
 
 struct ScalarDataBase : public StatData
@@ -2503,7 +2498,7 @@ struct NoBin
  * binned.  If the typedef is NoBin, nothing is binned.  If it is
  * MainBin, then all stats are binned under that Bin.
  */
-#ifdef FS_MEASURE
+#if defined(FS_MEASURE)
 typedef MainBin DefaultBin;
 #else
 typedef NoBin DefaultBin;