diff options
Diffstat (limited to 'libstdc++-v3/include/parallel/base.h')
| -rw-r--r-- | libstdc++-v3/include/parallel/base.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h index 1a8c3cb60a8..3e3041d27df 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; } @@ -267,8 +267,8 @@ namespace __gnu_parallel /** @brief Similar to std::plus, but allows two different types. */ template<typename _Tp1, typename _Tp2, typename _Result - = __typeof__(*static_cast<_Tp1*>(NULL) - + *static_cast<_Tp2*>(NULL))> + = __typeof__(*static_cast<_Tp1*>(0) + + *static_cast<_Tp2*>(0))> struct _Plus : public std::binary_function<_Tp1, _Tp2, _Result> { _Result @@ -283,8 +283,8 @@ namespace __gnu_parallel /** @brief Similar to std::multiplies, but allows two different types. */ template<typename _Tp1, typename _Tp2, typename _Result - = __typeof__(*static_cast<_Tp1*>(NULL) - * *static_cast<_Tp2*>(NULL))> + = __typeof__(*static_cast<_Tp1*>(0) + * *static_cast<_Tp2*>(0))> struct _Multiplies : public std::binary_function<_Tp1, _Tp2, _Result> { _Result @@ -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 |