stl_algo.h: Additional minor tweaks.

2004-02-01  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_algo.h: Additional minor tweaks.
	* include/bits/stl_map.h: Likewise.
	* include/bits/stl_multimap.h: Likewise.
	* include/bits/stl_multiset.h: Likewise.
	* include/bits/stl_set.h: Likewise.
	* include/bits/stl_tree.h: Likewise.

From-SVN: r77082

libstdc++-v3/ChangeLog

 2004-02-01  Paolo Carlini  <pcarlini@suse.de>
 
+	* include/bits/stl_algo.h: Additional minor tweaks.
+	* include/bits/stl_map.h: Likewise.
+	* include/bits/stl_multimap.h: Likewise.
+	* include/bits/stl_multiset.h: Likewise.
+	* include/bits/stl_set.h: Likewise.
+	* include/bits/stl_tree.h: Likewise.
+
+2004-02-01  Paolo Carlini  <pcarlini@suse.de>
+
 	* include/bits/vector.tcc (vector::_M_insert_aux(iterator)):
 	Remove, unused.
 

libstdc++-v3/include/bits/stl_algo.h

@@ -167,8 +167,7 @@ namespace std
   template<typename _InputIterator, typename _Tp>
     inline _InputIterator
     find(_InputIterator __first, _InputIterator __last,
-	 const _Tp& __val,
-	 input_iterator_tag)
+	 const _Tp& __val, input_iterator_tag)
     {
       while (__first != __last && !(*__first == __val))
 	++__first;
@@ -183,8 +182,7 @@ namespace std
   template<typename _InputIterator, typename _Predicate>
     inline _InputIterator
     find_if(_InputIterator __first, _InputIterator __last,
-	    _Predicate __pred,
-	    input_iterator_tag)
+	    _Predicate __pred, input_iterator_tag)
     {
       while (__first != __last && !__pred(*__first))
 	++__first;
@@ -199,8 +197,7 @@ namespace std
   template<typename _RandomAccessIterator, typename _Tp>
     _RandomAccessIterator
     find(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	 const _Tp& __val,
-	 random_access_iterator_tag)
+	 const _Tp& __val, random_access_iterator_tag)
     {
       typename iterator_traits<_RandomAccessIterator>::difference_type
 	__trip_count = (__last - __first) >> 2;
@@ -252,8 +249,7 @@ namespace std
   template<typename _RandomAccessIterator, typename _Predicate>
     _RandomAccessIterator
     find_if(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	    _Predicate __pred,
-	    random_access_iterator_tag)
+	    _Predicate __pred, random_access_iterator_tag)
     {
       typename iterator_traits<_RandomAccessIterator>::difference_type
 	__trip_count = (__last - __first) >> 2;

libstdc++-v3/include/bits/stl_map.h

@@ -613,10 +613,13 @@ namespace __gnu_norm
       { return _M_t.equal_range(__x); }
       
       template <typename _K1, typename _T1, typename _C1, typename _A1>
-      friend bool operator== (const map<_K1,_T1,_C1,_A1>&,
+        friend bool
+        operator== (const map<_K1,_T1,_C1,_A1>&,
 		    const map<_K1,_T1,_C1,_A1>&);
+
       template <typename _K1, typename _T1, typename _C1, typename _A1>
-      friend bool operator< (const map<_K1,_T1,_C1,_A1>&,
+        friend bool
+        operator< (const map<_K1,_T1,_C1,_A1>&,
 		   const map<_K1,_T1,_C1,_A1>&);
     };
   

libstdc++-v3/include/bits/stl_multimap.h

@@ -73,11 +73,13 @@ namespace __gnu_norm
     class multimap;
   
   template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-  inline bool operator==(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
+    inline bool
+    operator==(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
 	       const multimap<_Key,_Tp,_Compare,_Alloc>& __y);
   
   template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-  inline bool operator<(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
+    inline bool
+    operator<(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
 	      const multimap<_Key,_Tp,_Compare,_Alloc>& __y);
   
   /**

libstdc++-v3/include/bits/stl_multiset.h

@@ -72,11 +72,13 @@ namespace __gnu_norm
     class multiset;
 
   template <class _Key, class _Compare, class _Alloc>
-  inline bool operator==(const multiset<_Key,_Compare,_Alloc>& __x, 
+    inline bool
+    operator==(const multiset<_Key,_Compare,_Alloc>& __x, 
 	       const multiset<_Key,_Compare,_Alloc>& __y);
 
   template <class _Key, class _Compare, class _Alloc>
-  inline bool operator<(const multiset<_Key,_Compare,_Alloc>& __x, 
+    inline bool
+    operator<(const multiset<_Key,_Compare,_Alloc>& __x, 
 	      const multiset<_Key,_Compare,_Alloc>& __y);
 
   /**

libstdc++-v3/include/bits/stl_tree.h

@@ -539,7 +539,8 @@ namespace std
 	_M_node_count = __x._M_node_count;
       }
 
-      ~_Rb_tree() { _M_erase(_M_begin()); }
+      ~_Rb_tree()
+      { _M_erase(_M_begin()); }
 
       _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& 
       operator=(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x);
@@ -1209,8 +1210,8 @@ namespace std
     pair<typename _Rb_tree<_Key, _Val, _KoV,
 			   _Compare, _Alloc>::const_iterator,
 	 typename _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>::const_iterator>
-  _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>
-  ::equal_range(const _Key& __k) const
+    _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>::
+    equal_range(const _Key& __k) const
     { return pair<const_iterator, const_iterator>(lower_bound(__k),
 						  upper_bound(__k)); }