From 0b032f38aac55e2d85b2dfbdddd63b0eacc1834b Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 25 Jun 2010 09:43:18 +0000 Subject: [PATCH] profiler_trace.h: Uglify it to __it, use everywhere std::size_t instead of size_t. 2010-06-25 Paolo Carlini * include/profile/impl/profiler_trace.h: Uglify it to __it, use everywhere std::size_t instead of size_t. From-SVN: r161368 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/profile/impl/profiler_trace.h | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 08ceefc..58af8bf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2010-06-25 Paolo Carlini + + * include/profile/impl/profiler_trace.h: Uglify it to __it, use + everywhere std::size_t instead of size_t. + 2010-06-24 Paolo Carlini * include/profile/impl/profiler_trace.h (__trace_base<>:: diff --git a/libstdc++-v3/include/profile/impl/profiler_trace.h b/libstdc++-v3/include/profile/impl/profiler_trace.h index 0c0aec8..8a56b6a 100644 --- a/libstdc++-v3/include/profile/impl/profiler_trace.h +++ b/libstdc++-v3/include/profile/impl/profiler_trace.h @@ -462,8 +462,8 @@ namespace __gnu_profile std::fclose(__raw_file); // Sort data by magnitude, keeping just top N. - size_t __cutoff = std::min(_GLIBCXX_PROFILE_DATA(_S_max_warn_count), - __warnings.size()); + std::size_t __cutoff = std::min(_GLIBCXX_PROFILE_DATA(_S_max_warn_count), + __warnings.size()); __top_n(__warnings, __top_warnings, __cutoff); FILE* __warn_file = __open_output_file("txt"); @@ -564,10 +564,10 @@ namespace __gnu_profile if (!__env_value) { // Look it up in the config file. - __env_t::iterator it + __env_t::iterator __it = _GLIBCXX_PROFILE_DATA(__env).find(__factor->__env_var); - if (it != _GLIBCXX_PROFILE_DATA(__env).end()) - __env_value = (*it).second.c_str(); + if (__it != _GLIBCXX_PROFILE_DATA(__env).end()) + __env_value = (*__it).second.c_str(); } if (__env_value) -- 2.7.4