base.h (_PseudoSequence): Do not forward declare.

2010-03-22  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/parallel/base.h (_PseudoSequence): Do not forward declare.
	(_VoidFunctor): Remove, unused.
	(__median_of_three_iterators): Take __comp by value.
	(_PseudoSequenceIterator<>::operator++(int)): Do not const qualify
	the return type.
	(_PseudoSequenceIterator<>::operator!=): Fix return type to bool.

From-SVN: r157628

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 59c5a8e17e0017958103d15923cf6c58cf3537cc..dac1b8ef5ccafb635e4ffe242a3966fa36086e0d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/parallel/base.h (_PseudoSequence): Do not forward declare.
+       (_VoidFunctor): Remove, unused.
+       (__median_of_three_iterators): Take __comp by value.
+       (_PseudoSequenceIterator<>::operator++(int)): Do not const qualify
+       the return type.
+       (_PseudoSequenceIterator<>::operator!=): Fix return type to bool.
+
 2010-03-22  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/parallel/base.h (_Less): Use std::less.

diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h
index 6656b2caabb17a935920a64f4b92270aa854965a..1a8c3cb60a8dc16e3348757613ab8f4af7ea45d0 100644 (file)
--- a/libstdc++-v3/include/parallel/base.h
+++ b/libstdc++-v3/include/parallel/base.h
@@ -297,9 +297,6 @@ namespace __gnu_parallel
     struct _Multiplies<_Tp, _Tp, _Tp>
     : public std::multiplies<_Tp> { };
 
-  template<typename _Tp, typename _DifferenceTp>
-    class _PseudoSequence;
-
   /** @brief _Iterator associated with __gnu_parallel::_PseudoSequence.
    *  If features the usual random-access iterator functionality.
    *  @param _Tp Sequence _M_value type.
@@ -311,11 +308,6 @@ namespace __gnu_parallel
     public:
       typedef _DifferenceTp _DifferenceType;
 
-    private:
-      const _Tp& _M_val;
-      _DifferenceType _M_pos;
-
-    public:
       _PseudoSequenceIterator(const _Tp& __val, _DifferenceType __pos)
       : _M_val(__val), _M_pos(__pos) { }
 
@@ -328,7 +320,7 @@ namespace __gnu_parallel
       }
 
       // Post-increment operator.
-      const _PseudoSequenceIterator
+      _PseudoSequenceIterator
       operator++(int)
       { return _PseudoSequenceIterator(_M_pos++); }
 
@@ -344,13 +336,17 @@ namespace __gnu_parallel
       operator==(const _PseudoSequenceIterator& __i2)
       { return _M_pos == __i2._M_pos; }
 
-      _DifferenceType
+      bool
       operator!=(const _PseudoSequenceIterator& __i2)
       { return _M_pos != __i2._M_pos; }
 
       _DifferenceType
       operator-(const _PseudoSequenceIterator& __i2)
       { return _M_pos - __i2._M_pos; }
+
+    private:
+      const _Tp& _M_val;
+      _DifferenceType _M_pos;
     };
 
   /** @brief Sequence that conceptually consists of multiple copies of
@@ -390,14 +386,6 @@ namespace __gnu_parallel
       _DifferenceType _M_count;
     };
 
-  /** @brief Functor that does nothing */
-  template<typename _ValueTp>
-    class _VoidFunctor
-    {
-      inline void
-      operator()(const _ValueTp& __v) const { }
-    };
-
   /** @brief Compute the median of three referenced elements,
       according to @c __comp.
       *  @param __a First iterator.
@@ -408,7 +396,7 @@ namespace __gnu_parallel
   template<typename _RAIter, typename _Compare>
     _RAIter
     __median_of_three_iterators(_RAIter __a, _RAIter __b,
-                               _RAIter __c, _Compare& __comp)
+                               _RAIter __c, _Compare __comp)
     {
       if (__comp(*__a, *__b))
        if (__comp(*__b, *__c))