2004-05-13 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / bits / stl_pair.h

diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index 0bbaa24..d5146bb 100644 (file)
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -63,9 +63,8 @@
 
 namespace std
 {
-
   /// pair holds two objects of arbitrary type.
-  template <class _T1, class _T2>
+  template<class _T1, class _T2>
     struct pair
     {
       typedef _T1 first_type;    ///<  @c first_type is the first bound type
@@ -79,51 +78,51 @@ namespace std
       /** The default constructor creates @c first and @c second using their
        *  respective default constructors.  */
       pair()
-      : first(), second() {}
+      : first(), second() { }
 
       /** Two objects may be passed to a @c pair constructor to be copied.  */
       pair(const _T1& __a, const _T2& __b)
-      : first(__a), second(__b) {}
+      : first(__a), second(__b) { }
 
       /** There is also a templated copy ctor for the @c pair class itself.  */
-      template <class _U1, class _U2>
+      template<class _U1, class _U2>
         pair(const pair<_U1, _U2>& __p)
-       : first(__p.first), second(__p.second) {}
+       : first(__p.first), second(__p.second) { }
     };
 
   /// Two pairs of the same type are equal iff their members are equal.
-  template <class _T1, class _T2>
+  template<class _T1, class _T2>
     inline bool
     operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
     { return __x.first == __y.first && __x.second == __y.second; }
 
   /// <http://gcc.gnu.org/onlinedocs/libstdc++/20_util/howto.html#pairlt>
-  template <class _T1, class _T2>
+  template<class _T1, class _T2>
     inline bool
     operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
     { return __x.first < __y.first
             || (!(__y.first < __x.first) && __x.second < __y.second); }
 
   /// Uses @c operator== to find the result.
-  template <class _T1, class _T2>
+  template<class _T1, class _T2>
     inline bool
     operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
     { return !(__x == __y); }
 
   /// Uses @c operator< to find the result.
-  template <class _T1, class _T2>
+  template<class _T1, class _T2>
     inline bool
     operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
     { return __y < __x; }
 
   /// Uses @c operator< to find the result.
-  template <class _T1, class _T2>
+  template<class _T1, class _T2>
     inline bool
     operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
     { return !(__y < __x); }
 
   /// Uses @c operator< to find the result.
-  template <class _T1, class _T2>
+  template<class _T1, class _T2>
     inline bool
     operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
     { return !(__x < __y); }
@@ -138,18 +137,11 @@ namespace std
    *  but LWG issue #181 says they should be passed by const value.  We follow
    *  the LWG by default.
    */
-  template <class _T1, class _T2>
-
   // _GLIBCXX_RESOLVE_LIB_DEFECTS
   // 181.  make_pair() unintended behavior
-  inline pair<_T1, _T2>
-  make_pair(_T1 __x, _T2 __y)
-  { return pair<_T1, _T2>(__x, __y); }
-
+  template<class _T1, class _T2>
+    inline pair<_T1, _T2>
+    make_pair(_T1 __x, _T2 __y) { return pair<_T1, _T2>(__x, __y); }
 } // namespace std
 
 #endif /* _PAIR_H */
-
-// Local Variables:
-// mode:C++
-// End: