 @@ -1726,31 +1726,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @p (__result_last-__result_first).
    *  After the sort if @e i and @e j are iterators in the range
    *  @p [__result_first,__result_first+N) such that i precedes j then
    *  *j<*i is false.
    *  The value returned is @p __result_first+N.
   */
   template<typename _InputIterator, typename _RandomAccessIterator>
     inline _RandomAccessIterator
     partial_sort_copy(_InputIterator __first, _InputIterator __last,
 		      _RandomAccessIterator __result_first,
 		      _RandomAccessIterator __result_last)
+    {
       typedef typename iterator_traits<_InputIterator>::value_type
-	_InputValueType __unused;
+	_InputValueType __attribute__((__unused__));
       typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_OutputValueType __unused;
+	_OutputValueType __attribute__((__unused__));
       typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType __unused;
+	_DistanceType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
       __glibcxx_function_requires(_ConvertibleConcept<_InputValueType,
 				  _OutputValueType>)
       __glibcxx_function_requires(_LessThanOpConcept<_InputValueType,
 				                     _OutputValueType>)
       __glibcxx_function_requires(_LessThanComparableConcept<_OutputValueType>)
       __glibcxx_requires_valid_range(__first, __last);
       __glibcxx_requires_valid_range(__result_first, __result_last);
       return std::__partial_sort_copy(__first, __last,
 				      __result_first, __result_last,
 @@ -1776,31 +1776,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @p [__result_first,__result_first+N) such that i precedes j then
    *  @p __comp(*j,*i) is false.
    *  The value returned is @p __result_first+N.
   */
   template<typename _InputIterator, typename _RandomAccessIterator,
 	   typename _Compare>
     inline _RandomAccessIterator
     partial_sort_copy(_InputIterator __first, _InputIterator __last,
 		      _RandomAccessIterator __result_first,
 		      _RandomAccessIterator __result_last,
 		      _Compare __comp)
+    {
       typedef typename iterator_traits<_InputIterator>::value_type
-	_InputValueType __unused;
+	_InputValueType __attribute__((__unused__));
       typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_OutputValueType __unused;
+	_OutputValueType __attribute__((__unused__));
       typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType __unused;
+	_DistanceType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 				  _RandomAccessIterator>)
       __glibcxx_function_requires(_ConvertibleConcept<_InputValueType,
 				  _OutputValueType>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _InputValueType, _OutputValueType>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _OutputValueType, _OutputValueType>)
       __glibcxx_requires_valid_range(__first, __last);
       __glibcxx_requires_valid_range(__result_first, __result_last);
 @@ -2009,27 +2009,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *           than</em> @p __val, or end() if every element is less
    *           than @p __val.
    *  @ingroup binary_search_algorithms
+   *
    *  The comparison function should have the same effects on ordering as
    *  the function used for the initial sort.
   */
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
     inline _ForwardIterator
     lower_bound(_ForwardIterator __first, _ForwardIterator __last,
 		const _Tp& __val, _Compare __comp)
+    {
       typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType __unused;
+	_ValueType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _ValueType, _Tp>)
       __glibcxx_requires_partitioned_lower_pred(__first, __last,
 						__val, __comp);
       return std::__lower_bound(__first, __last, __val,
 				__gnu_cxx::__ops::__iter_comp_val(__comp));
+    }
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
 @@ -2066,27 +2066,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @param  __first   An iterator.
    *  @param  __last    Another iterator.
    *  @param  __val     The search term.
    *  @return  An iterator pointing to the first element greater than @p __val,
    *           or end() if no elements are greater than @p __val.
    *  @ingroup binary_search_algorithms
   */
   template<typename _ForwardIterator, typename _Tp>
     inline _ForwardIterator
     upper_bound(_ForwardIterator __first, _ForwardIterator __last,
 		const _Tp& __val)
+    {
       typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType __unused;
+	_ValueType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
       __glibcxx_requires_partitioned_upper(__first, __last, __val);
       return std::__upper_bound(__first, __last, __val,
 				__gnu_cxx::__ops::__val_less_iter());
+    }
   /**
    *  @brief Finds the last position in which @p __val could be inserted
    *         without changing the ordering.
 @@ -2098,27 +2098,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @return  An iterator pointing to the first element greater than @p __val,
    *           or end() if no elements are greater than @p __val.
    *  @ingroup binary_search_algorithms
+   *
    *  The comparison function should have the same effects on ordering as
    *  the function used for the initial sort.
   */
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
     inline _ForwardIterator
     upper_bound(_ForwardIterator __first, _ForwardIterator __last,
 		const _Tp& __val, _Compare __comp)
+    {
       typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType __unused;
+	_ValueType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _Tp, _ValueType>)
       __glibcxx_requires_partitioned_upper_pred(__first, __last,
 						__val, __comp);
       return std::__upper_bound(__first, __last, __val,
 				__gnu_cxx::__ops::__val_comp_iter(__comp));
+    }
   template<typename _ForwardIterator, typename _Tp,
 @@ -2172,27 +2172,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  This is equivalent to
    *  @code
    *    std::make_pair(lower_bound(__first, __last, __val),
    *                   upper_bound(__first, __last, __val))
    *  @endcode
    *  but does not actually call those functions.
   */
   template<typename _ForwardIterator, typename _Tp>
     inline pair<_ForwardIterator, _ForwardIterator>
     equal_range(_ForwardIterator __first, _ForwardIterator __last,
 		const _Tp& __val)
+    {
       typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType __unused;
+	_ValueType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_LessThanOpConcept<_ValueType, _Tp>)
       __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
       __glibcxx_requires_partitioned_lower(__first, __last, __val);
       __glibcxx_requires_partitioned_upper(__first, __last, __val);
       return std::__equal_range(__first, __last, __val,
 				__gnu_cxx::__ops::__iter_less_val(),
 				__gnu_cxx::__ops::__val_less_iter());
+    }
 @@ -2209,27 +2209,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  This is equivalent to
    *  @code
    *    std::make_pair(lower_bound(__first, __last, __val, __comp),
    *                   upper_bound(__first, __last, __val, __comp))
    *  @endcode
    *  but does not actually call those functions.
   */
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
     inline pair<_ForwardIterator, _ForwardIterator>
     equal_range(_ForwardIterator __first, _ForwardIterator __last,
 		const _Tp& __val, _Compare __comp)
+    {
       typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType __unused;
+	_ValueType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _ValueType, _Tp>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _Tp, _ValueType>)
       __glibcxx_requires_partitioned_lower_pred(__first, __last,
 						__val, __comp);
       __glibcxx_requires_partitioned_upper_pred(__first, __last,
 						__val, __comp);
       return std::__equal_range(__first, __last, __val,
 @@ -2245,27 +2245,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @param  __val     The search term.
    *  @return True if @p __val (or its equivalent) is in [@p
    *  __first,@p __last ].
+   *
    *  Note that this does not actually return an iterator to @p __val.  For
    *  that, use std::find or a container's specialized find member functions.
   */
   template<typename _ForwardIterator, typename _Tp>
     bool
     binary_search(_ForwardIterator __first, _ForwardIterator __last,
                   const _Tp& __val)
+    {
       typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType __unused;
+	_ValueType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
       __glibcxx_requires_partitioned_lower(__first, __last, __val);
       __glibcxx_requires_partitioned_upper(__first, __last, __val);
       _ForwardIterator __i
 	= std::__lower_bound(__first, __last, __val,
 			     __gnu_cxx::__ops::__iter_less_val());
       return __i != __last && !(__val < *__i);
+    }
 @@ -2280,27 +2280,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+   *
    *  Note that this does not actually return an iterator to @p __val.  For
    *  that, use std::find or a container's specialized find member functions.
+   *
    *  The comparison function should have the same effects on ordering as
    *  the function used for the initial sort.
   */
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
     bool
     binary_search(_ForwardIterator __first, _ForwardIterator __last,
                   const _Tp& __val, _Compare __comp)
+    {
       typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType __unused;
+	_ValueType __attribute__((__unused__));
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _Tp, _ValueType>)
       __glibcxx_requires_partitioned_lower_pred(__first, __last,
 						__val, __comp);
       __glibcxx_requires_partitioned_upper_pred(__first, __last,
 						__val, __comp);
       _ForwardIterator __i
 	= std::__lower_bound(__first, __last, __val,
 			     __gnu_cxx::__ops::__iter_comp_val(__comp));