X-Git-Url: http://g0dil.de/git?p=senf.git;a=blobdiff_plain;f=senf%2FUtils%2FStatistics.cci;fp=senf%2FUtils%2FStatistics.cci;h=8e7b093de88eeb2dfcc906bb91b948664df7129f;hp=8842ac57567e6ab9a043dc44a232d6f6301e61c9;hb=9de1568365b7ac411b84da000e18516d9c3b3293;hpb=278a84e69f5d840d57030bce582413ad5ebcf03e diff --git a/senf/Utils/Statistics.cci b/senf/Utils/Statistics.cci index 8842ac5..8e7b093 100644 --- a/senf/Utils/Statistics.cci +++ b/senf/Utils/Statistics.cci @@ -39,6 +39,16 @@ //-///////////////////////////////////////////////////////////////////////////////////////////////// //-///////////////////////////////////////////////////////////////////////////////////////////////// +// senf::StatisticsBase::Transform + +prefix_ senf::StatisticsBase::Transform::result_type +senf::StatisticsBase::Transform::operator()(first_argument_type i) + const +{ + return i.second; +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::StatisticsBase::OutputEntry prefix_ senf::StatisticsBase::OutputEntry::OutputEntry() @@ -88,13 +98,7 @@ prefix_ senf::StatisticsBase::~StatisticsBase() prefix_ senf::StatisticsBase::CollectorRange senf::StatisticsBase::collectors() { - return senf::make_transform_range(children_,__gnu_cxx::select2nd()); -} - -prefix_ senf::StatisticsBase::const_CollectorRange senf::StatisticsBase::collectors() - const -{ - return senf::make_transform_range(children_,__gnu_cxx::select2nd()); + return senf::make_transform_range(children_, Transform()); } prefix_ float senf::StatisticsBase::min() @@ -132,12 +136,6 @@ prefix_ senf::Statistics & senf::StatisticsBase::base() return v_base(); } -prefix_ senf::Statistics const & senf::StatisticsBase::base() - const -{ - return const_cast(this)->v_base(); -} - prefix_ std::string senf::StatisticsBase::path() const { @@ -145,7 +143,6 @@ prefix_ std::string senf::StatisticsBase::path() } prefix_ senf::StatisticsData senf::StatisticsBase::data() - const { return StatisticsData(min_, avg_, max_, dev_, 0); }