diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-03-19 11:10:08 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-03-19 11:10:08 +0000 |
| commit | afcd05a759ab3133422fa471021ed00657971ebc (patch) | |
| tree | 18731c4de45d656d2be3995506e393aff5cecc6a | |
| parent | 247d8075711bc24632eb919c15524ed095485c16 (diff) | |
| download | gcc-afcd05a759ab3133422fa471021ed00657971ebc.zip gcc-afcd05a759ab3133422fa471021ed00657971ebc.tar.gz gcc-afcd05a759ab3133422fa471021ed00657971ebc.tar.bz2 | |
random.tcc: Minor formatting changes.
2010-03-19 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/random.tcc: Minor formatting changes.
2010-03-19 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_algo.h (shuffle): Fix typo in signature.
* include/bits/algorithmfwd.h: Adjust.
* testsuite/25_algorithms/shuffle/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/shuffle/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r157565
6 files changed, 27 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1b06dae..9dec9f9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,18 @@ 2010-03-19 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/random.tcc: Minor formatting changes. + +2010-03-19 Paolo Carlini <paolo.carlini@oracle.com> + + * include/bits/stl_algo.h (shuffle): Fix typo in signature. + * include/bits/algorithmfwd.h: Adjust. + * testsuite/25_algorithms/shuffle/requirements/ + explicit_instantiation/2.cc: Likewise. + * testsuite/25_algorithms/shuffle/requirements/ + explicit_instantiation/pod.cc: Likewise. + +2010-03-19 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/stl_algo.h (shuffle): Add, per D3056. (random_shuffle): Fix signature in C++0x mode. (lower_bound, __lg): Move... diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index 803fa47..645d883 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -521,7 +521,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #if defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(_GLIBCXX_USE_C99_STDINT_TR1) template<typename _RAIter, typename _UGenerator> void - shuffle(_RAIter, _RAIter, _UGenerator&&); + shuffle(_RAIter, _RAIter, _UGenerator&); #endif template<typename _RAIter> diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index e47b1c8..5a66bd6 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -87,16 +87,16 @@ namespace std { return __a * __x + __c; } }; - template<typename _InputIterator, typename _OutputIterator, - typename _UnaryOperation> - _OutputIterator - __transform(_InputIterator __first, _InputIterator __last, - _OutputIterator __result, _UnaryOperation __unary_op) - { - for (; __first != __last; ++__first, ++__result) - *__result = __unary_op(*__first); - return __result; - } + template<typename _InputIterator, typename _OutputIterator, + typename _UnaryOperation> + _OutputIterator + __transform(_InputIterator __first, _InputIterator __last, + _OutputIterator __result, _UnaryOperation __unary_op) + { + for (; __first != __last; ++__first, ++__result) + *__result = __unary_op(*__first); + return __result; + } } // namespace __detail diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 2f96d06..126305a 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -4079,7 +4079,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typename _UniformRandomNumberGenerator> void shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last, - _UniformRandomNumberGenerator&& __g) + _UniformRandomNumberGenerator& __g) { // concept requirements __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< diff --git a/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/2.cc b/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/2.cc index 4b921dc..6941bd0 100644 --- a/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/2.cc @@ -34,5 +34,5 @@ namespace std typedef value_type* iterator_type; typedef std::mt19937_64 ugenerator_type; - template void shuffle(iterator_type, iterator_type, ugenerator_type&&); + template void shuffle(iterator_type, iterator_type, ugenerator_type&); } diff --git a/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/pod.cc b/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/pod.cc index 0f0a1e1..a33ddd4 100644 --- a/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/pod.cc +++ b/libstdc++-v3/testsuite/25_algorithms/shuffle/requirements/explicit_instantiation/pod.cc @@ -33,5 +33,5 @@ namespace std typedef value_type* iterator_type; typedef std::mt19937_64 ugenerator_type; - template void shuffle(iterator_type, iterator_type, ugenerator_type&&); + template void shuffle(iterator_type, iterator_type, ugenerator_type&); } |