fixes for Ubuntu Oneiric (g++ 4.6.1, boost 1.46.1)

[senf.git] / senf / Utils / StatisticAccumulator.hh

diff --git a/senf/Utils/StatisticAccumulator.hh b/senf/Utils/StatisticAccumulator.hh
index ab76979..ed64e89 100644 (file)
--- a/senf/Utils/StatisticAccumulator.hh
+++ b/senf/Utils/StatisticAccumulator.hh
@@ -33,20 +33,18 @@
 // Custom includes
 #include <math.h>
 #include <boost/cstdint.hpp>
+#include <senf/Utils/Format.hh>
 ///////////////////////////////hh.p////////////////////////////////////////
 namespace senf {
 
      struct StatisticsData
      {
-        StatisticsData( float min_, float avg_, float max_, float stddev_, boost::uint32_t count_)
-            : min(min_), avg(avg_), max(max_), stddev(stddev_), count(count_){
-        };
-        StatisticsData( StatisticsData const & other)
-            : min(other.min), avg(other.avg), max(other.max), stddev(other.stddev), count(other.count){
-        };
-        StatisticsData()
-            : min(0.0), avg(0.0), max(0.0), stddev(0.0), count(0){
-        };
+         StatisticsData(float min_, float avg_, float max_, float stddev_, boost::uint32_t count_)
+             : min(min_), avg(avg_), max(max_), stddev(stddev_), count(count_) {};
+         StatisticsData(StatisticsData const & other)
+             : min(other.min), avg(other.avg), max(other.max), stddev(other.stddev), count(other.count) {};
+         StatisticsData()
+             : min(0.0), avg(0.0), max(0.0), stddev(0.0), count(0) {};
 
          float min;
          float avg;
@@ -55,6 +53,8 @@ namespace senf {
          boost::uint32_t count;
      };
 
+     std::ostream & operator<<(std::ostream & os, StatisticsData const & _data);
+
      /** \brief Accumulate measurement values
 
          The accumulator mainly do the prelimenary work for the senf::Statistic class.