From 6e687a9ad7da29caabd39b6b120ec49fd108a881 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 19 Sep 2010 09:44:24 +0000 Subject: [PATCH] Uglify C++ headers some more. libstdc++-v3/: * include/ext/throw_allocator.h (hash<__gnu_cxx::throw_value_limit>::operator()): Uglify local. (hash<__gnu_cxx::throw_value_random>::operator()): Likewise. * include/parallel/set_operations.h (__symmetric_difference_func): Uglify remaining arguments to __count, __first_empty, _M_invoke. (__difference_func): Likewise for __count. * include/profile/impl/profiler_node.h (__object_info_base::__write): Uglify parameter. From-SVN: r164411 --- libstdc++-v3/ChangeLog | 11 +++++++++++ libstdc++-v3/include/ext/throw_allocator.h | 8 ++++---- libstdc++-v3/include/parallel/set_operations.h | 18 +++++++++--------- .../include/profile/impl/profiler_node.h | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d50afd3c0c8..bfcc965809c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2010-09-19 Ralf Wildenhues + + * include/ext/throw_allocator.h + (hash<__gnu_cxx::throw_value_limit>::operator()): Uglify local. + (hash<__gnu_cxx::throw_value_random>::operator()): Likewise. + * include/parallel/set_operations.h (__symmetric_difference_func): + Uglify remaining arguments to __count, __first_empty, _M_invoke. + (__difference_func): Likewise for __count. + * include/profile/impl/profiler_node.h + (__object_info_base::__write): Uglify parameter. + 2010-09-19 Paolo Carlini * src/hash_bytes.cc: Compile load_bytes and shift_mix only when diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h index 669d433e272..cc344787e83 100644 --- a/libstdc++-v3/include/ext/throw_allocator.h +++ b/libstdc++-v3/include/ext/throw_allocator.h @@ -737,8 +737,8 @@ namespace std size_t operator()(const __gnu_cxx::throw_value_limit& __val) const { - std::hash h; - size_t __result = h(__val._M_i); + std::hash __h; + size_t __result = __h(__val._M_i); return __result; } }; @@ -751,8 +751,8 @@ namespace std size_t operator()(const __gnu_cxx::throw_value_random& __val) const { - std::hash h; - size_t __result = h(__val._M_i); + std::hash __h; + size_t __result = __h(__val._M_i); return __result; } }; diff --git a/libstdc++-v3/include/parallel/set_operations.h b/libstdc++-v3/include/parallel/set_operations.h index f6b076f0655..f552c1dda1b 100644 --- a/libstdc++-v3/include/parallel/set_operations.h +++ b/libstdc++-v3/include/parallel/set_operations.h @@ -103,11 +103,11 @@ namespace __gnu_parallel } _DifferenceType - __count(_IIter __a, _IIter __b, _IIter __c, _IIter d) const + __count(_IIter __a, _IIter __b, _IIter __c, _IIter __d) const { _DifferenceType __counter = 0; - while (__a != __b && __c != d) + while (__a != __b && __c != __d) { if (_M_comp(*__a, *__c)) { @@ -126,12 +126,12 @@ namespace __gnu_parallel } } - return __counter + (__b - __a) + (d - __c); + return __counter + (__b - __a) + (__d - __c); } _OutputIterator - __first_empty(_IIter __c, _IIter d, _OutputIterator __out) const - { return std::copy(__c, d, __out); } + __first_empty(_IIter __c, _IIter __d, _OutputIterator __out) const + { return std::copy(__c, __d, __out); } _OutputIterator __second_empty(_IIter __a, _IIter __b, _OutputIterator __out) const @@ -153,10 +153,10 @@ namespace __gnu_parallel _Compare _M_comp; _OutputIterator - _M_invoke(_IIter __a, _IIter __b, _IIter __c, _IIter d, + _M_invoke(_IIter __a, _IIter __b, _IIter __c, _IIter __d, _OutputIterator __r) const { - while (__a != __b && __c != d) + while (__a != __b && __c != __d) { if (_M_comp(*__a, *__c)) { @@ -177,11 +177,11 @@ namespace __gnu_parallel _DifferenceType __count(_IIter __a, _IIter __b, - _IIter __c, _IIter d) const + _IIter __c, _IIter __d) const { _DifferenceType __counter = 0; - while (__a != __b && __c != d) + while (__a != __b && __c != __d) { if (_M_comp(*__a, *__c)) { diff --git a/libstdc++-v3/include/profile/impl/profiler_node.h b/libstdc++-v3/include/profile/impl/profiler_node.h index d22a3e16b48..86f541f59d7 100644 --- a/libstdc++-v3/include/profile/impl/profiler_node.h +++ b/libstdc++-v3/include/profile/impl/profiler_node.h @@ -148,7 +148,7 @@ namespace __gnu_profile __stack() const { return _M_stack; } - virtual void __write(FILE* f) const = 0; + virtual void __write(FILE* __f) const = 0; protected: __stack_t _M_stack;