diff options
author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-25 09:43:18 +0000 |
---|---|---|
committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-25 09:43:18 +0000 |
commit | 1a09a966fd30513b6c78e9658b89583160929276 (patch) | |
tree | b822d9b57fe30c0163299f1a4ab9d1520e1eaa71 /libstdc++-v3 | |
parent | 00f4f70565fa903b89c2f1be5059898ddb069db0 (diff) | |
download | gcc-1a09a966fd30513b6c78e9658b89583160929276.tar.gz |
2010-06-25 Paolo Carlini <paolo.carlini@oracle.com>
* include/profile/impl/profiler_trace.h: Uglify it to __it, use
everywhere std::size_t instead of size_t.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161368 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | 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 08ceefc1e24..58af8bff23f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2010-06-25 Paolo Carlini <paolo.carlini@oracle.com> + + * include/profile/impl/profiler_trace.h: Uglify it to __it, use + everywhere std::size_t instead of size_t. + 2010-06-24 Paolo Carlini <paolo.carlini@oracle.com> * 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 0c0aec8f598..8a56b6a8206 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) |