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
This commit is contained in:
parent
7a40b8b121
commit
2d9ca17ba9
3 changed files with 13 additions and 7 deletions
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue