diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-06-13 15:44:51 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-06-13 15:44:51 +0000 |
| commit | 2d9ca17ba98b2fcf77b8df192634a27f8e5d4d5b (patch) | |
| tree | 69fb3a81c2825c562d59375b7afaf8d15261253b | |
| parent | 7a40b8b1219358fed159dbfe516ad795252f062c (diff) | |
| download | gcc-2d9ca17ba98b2fcf77b8df192634a27f8e5d4d5b.zip gcc-2d9ca17ba98b2fcf77b8df192634a27f8e5d4d5b.tar.gz gcc-2d9ca17ba98b2fcf77b8df192634a27f8e5d4d5b.tar.bz2 | |
base.h (min, max): Mark inline.
2010-06-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/parallel/base.h (min, max): Mark inline.
* include/parallel/set_operations.h (__parallel_set_operation):
Uglify the Operation template parameter.
From-SVN: r160683
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/base.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/set_operations.h | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 96dd53a..8833723 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2010-06-13 Paolo Carlini <paolo.carlini@oracle.com> + + * include/parallel/base.h (min, max): Mark inline. + * include/parallel/set_operations.h (__parallel_set_operation): + Uglify the Operation template parameter. + 2010-06-11 Paolo Carlini <paolo.carlini@oracle.com> * include/bits/shared_ptr.h (hash<shared_ptr>): Add. diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h index 7bff97f..3e3041d 100644 --- a/libstdc++-v3/include/parallel/base.h +++ b/libstdc++-v3/include/parallel/base.h @@ -140,13 +140,13 @@ namespace __gnu_parallel /** @brief Equivalent to std::min. */ template<typename _Tp> - const _Tp& + inline const _Tp& min(const _Tp& __a, const _Tp& __b) { return (__a < __b) ? __a : __b; } /** @brief Equivalent to std::max. */ template<typename _Tp> - const _Tp& + inline const _Tp& max(const _Tp& __a, const _Tp& __b) { return (__a > __b) ? __a : __b; } @@ -300,7 +300,7 @@ namespace __gnu_parallel /** @brief _Iterator associated with __gnu_parallel::_PseudoSequence. * If features the usual random-access iterator functionality. * @param _Tp Sequence _M_value type. - * @param _DifferenceType Sequence difference type. + * @param _DifferenceTp Sequence difference type. */ template<typename _Tp, typename _DifferenceTp> class _PseudoSequenceIterator @@ -353,7 +353,7 @@ namespace __gnu_parallel the same element. * The copies are not stored explicitly, of course. * @param _Tp Sequence _M_value type. - * @param _DifferenceType Sequence difference type. + * @param _DifferenceTp Sequence difference type. */ template<typename _Tp, typename _DifferenceTp> class _PseudoSequence diff --git a/libstdc++-v3/include/parallel/set_operations.h b/libstdc++-v3/include/parallel/set_operations.h index 346fb97..f6b076f 100644 --- a/libstdc++-v3/include/parallel/set_operations.h +++ b/libstdc++-v3/include/parallel/set_operations.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010 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 terms @@ -345,11 +345,11 @@ namespace __gnu_parallel template<typename _IIter, typename _OutputIterator, - typename Operation> + typename _Operation> _OutputIterator __parallel_set_operation(_IIter __begin1, _IIter __end1, _IIter __begin2, _IIter __end2, - _OutputIterator __result, Operation __op) + _OutputIterator __result, _Operation __op) { _GLIBCXX_CALL((__end1 - __begin1) + (__end2 - __begin2)) |