diff options
author | Paolo Carlini <paolo@gcc.gnu.org> | 2010-06-25 11:37:54 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-06-25 11:37:54 +0000 |
commit | 47d660fbccfa16d612d09eeb7e44bf683e1526e8 (patch) | |
tree | 2c858010a5a97024b9c848e0fbf887790a8c7a7c | |
parent | d68411092e47af805ef8a8530dbc75f0669e4c63 (diff) | |
download | gcc-47d660fbccfa16d612d09eeb7e44bf683e1526e8.zip gcc-47d660fbccfa16d612d09eeb7e44bf683e1526e8.tar.gz gcc-47d660fbccfa16d612d09eeb7e44bf683e1526e8.tar.bz2 |
profiler_list_to_slist.h: Remove spurious semicolon; prefer pre-increment.
2010-06-25 Paolo Carlini <paolo.carlini@oracle.com>
* include/profile/impl/profiler_list_to_slist.h: Remove spurious
semicolon; prefer pre-increment.
* include/profile/impl/profiler_container_size.h: Use everywhere
qualified std::size_t.
* include/profile/impl/profiler_trace.h (__trace_base<>::
__collect_warnings): Tidy loop.
* include/profile/impl/profiler_vector_to_list.h: Minor formatting
changes.
From-SVN: r161373
4 files changed, 12 insertions, 12 deletions
diff --git a/libstdc++-v3/include/profile/impl/profiler_container_size.h b/libstdc++-v3/include/profile/impl/profiler_container_size.h index aceef91..5c7d08b 100644 --- a/libstdc++-v3/include/profile/impl/profiler_container_size.h +++ b/libstdc++-v3/include/profile/impl/profiler_container_size.h @@ -179,16 +179,16 @@ namespace __gnu_profile // Insert a new node at construct with object, callstack and initial size. void - __insert(const __object_t __obj, __stack_t __stack, size_t __num) + __insert(const __object_t __obj, __stack_t __stack, std::size_t __num) { __add_object(__obj, __container_size_info(__stack, __num)); } // XXX Undefined? void - __construct(const void* __obj, size_t __inum); + __construct(const void* __obj, std::size_t __inum); // Call at destruction/clean to set container final size. void - __destruct(const void* __obj, size_t __num, size_t __inum) + __destruct(const void* __obj, std::size_t __num, std::size_t __inum) { if (!__is_on()) return; diff --git a/libstdc++-v3/include/profile/impl/profiler_list_to_slist.h b/libstdc++-v3/include/profile/impl/profiler_list_to_slist.h index 9b5a5b2..299a17d 100644 --- a/libstdc++-v3/include/profile/impl/profiler_list_to_slist.h +++ b/libstdc++-v3/include/profile/impl/profiler_list_to_slist.h @@ -77,7 +77,7 @@ namespace __gnu_profile } void - __merge(const __list2slist_info&) { }; + __merge(const __list2slist_info&) { } void __write(FILE* __f) const @@ -96,7 +96,7 @@ namespace __gnu_profile void __record_operation() - { _M_operations++; } + { ++_M_operations; } bool __has_rewind() diff --git a/libstdc++-v3/include/profile/impl/profiler_trace.h b/libstdc++-v3/include/profile/impl/profiler_trace.h index 8a56b6a..1dfdd01 100644 --- a/libstdc++-v3/include/profile/impl/profiler_trace.h +++ b/libstdc++-v3/include/profile/impl/profiler_trace.h @@ -225,12 +225,11 @@ namespace __gnu_profile __trace_base<__object_info, __stack_info>:: __collect_warnings(__warning_vector_t& __warnings) { - typename __stack_table_t::iterator __i = __stack_table.begin(); - for (; __i != __stack_table.end(); ++__i) - __warnings.push_back(__warning_data((*__i).second.__magnitude(), - (*__i).first, - __id, - (*__i).second.__advice())); + for (typename __stack_table_t::iterator __it + = __stack_table.begin(); __it != __stack_table.end(); ++__it) + __warnings.push_back(__warning_data((*__it).second.__magnitude(), + (*__it).first, __id, + (*__it).second.__advice())); } template<typename __object_info, typename __stack_info> diff --git a/libstdc++-v3/include/profile/impl/profiler_vector_to_list.h b/libstdc++-v3/include/profile/impl/profiler_vector_to_list.h index 01c7a19..9196313 100644 --- a/libstdc++-v3/include/profile/impl/profiler_vector_to_list.h +++ b/libstdc++-v3/include/profile/impl/profiler_vector_to_list.h @@ -98,7 +98,8 @@ namespace __gnu_profile __iterate() { return _M_iterate; } - float __list_cost() + float + __list_cost() { return _M_list_cost; } std::size_t |