diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-07-30 13:02:58 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-07-30 13:02:58 +0000 |
| commit | 43804767bb0ac9695e67f01b9a4a708d79c72465 (patch) | |
| tree | fa10507574d1548c2333496f0adf7b3de28d126e | |
| parent | 56ee081b4a698df0959b6a312694846b56964d2d (diff) | |
| download | gcc-43804767bb0ac9695e67f01b9a4a708d79c72465.zip gcc-43804767bb0ac9695e67f01b9a4a708d79c72465.tar.gz gcc-43804767bb0ac9695e67f01b9a4a708d79c72465.tar.bz2 | |
stl_algo.h (stable_sort): Uglify the buf variable.
2006-07-30 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (stable_sort): Uglify the buf variable.
* include/bits/stl_tempbuf.h (_Temporary_buffer<>::
_M_initialize_buffer): Uglify the val parameter.
From-SVN: r115820
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_algo.h | 19 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_tempbuf.h | 9 |
3 files changed, 21 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fc42bdb..33c2d80 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2006-07-30 Paolo Carlini <pcarlini@suse.de> + + * include/bits/stl_algo.h (stable_sort): Uglify the buf variable. + * include/bits/stl_tempbuf.h (_Temporary_buffer<>:: + _M_initialize_buffer): Uglify the val parameter. + 2006-07-27 Benjamin Kosnik <bkoz@wells.artheist.org> PR libstdc++/19664 round 3 diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 8da0613..cbdcd98 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -3850,13 +3850,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) __glibcxx_requires_valid_range(__first, __last); - _Temporary_buffer<_RandomAccessIterator, _ValueType> - buf(__first, __last); - if (buf.begin() == 0) + _Temporary_buffer<_RandomAccessIterator, _ValueType> __buf(__first, + __last); + if (__buf.begin() == 0) std::__inplace_stable_sort(__first, __last); else - std::__stable_sort_adaptive(__first, __last, buf.begin(), - _DistanceType(buf.size())); + std::__stable_sort_adaptive(__first, __last, __buf.begin(), + _DistanceType(__buf.size())); } /** @@ -3894,12 +3894,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _ValueType>) __glibcxx_requires_valid_range(__first, __last); - _Temporary_buffer<_RandomAccessIterator, _ValueType> buf(__first, __last); - if (buf.begin() == 0) + _Temporary_buffer<_RandomAccessIterator, _ValueType> __buf(__first, + __last); + if (__buf.begin() == 0) std::__inplace_stable_sort(__first, __last, __comp); else - std::__stable_sort_adaptive(__first, __last, buf.begin(), - _DistanceType(buf.size()), __comp); + std::__stable_sort_adaptive(__first, __last, __buf.begin(), + _DistanceType(__buf.size()), __comp); } /** diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h index 970af45..fbe24e7 100644 --- a/libstdc++-v3/include/bits/stl_tempbuf.h +++ b/libstdc++-v3/include/bits/stl_tempbuf.h @@ -1,6 +1,7 @@ // Temporary buffer implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -78,7 +79,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // concept requirements __glibcxx_class_requires(_ForwardIterator, _ForwardIteratorConcept) - public: + public: typedef _Tp value_type; typedef value_type* pointer; typedef pointer iterator; @@ -93,8 +94,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_initialize_buffer(const _Tp&, __true_type) { } void - _M_initialize_buffer(const _Tp& val, __false_type) - { std::uninitialized_fill_n(_M_buffer, _M_len, val); } + _M_initialize_buffer(const _Tp& __val, __false_type) + { std::uninitialized_fill_n(_M_buffer, _M_len, __val); } public: /// As per Table mumble. |