tuple: Only include <utility> for std::pair, and forward declare reference_wrapper...

2007-03-13  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/tuple: Only include <utility> for std::pair, and
	forward declare reference_wrapper; formatting fixes.
	* include/tr1/ref_fwd.h: Remove.
	* include/tr1/tuple_defs.h: Remove, unused.
	* include/Makefile.am: Update.
	* include/Makefile.in: Regenerate.
	* testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc:
	Include <tr1/functional> too.

	* include/tr1/tuple: Define tuple_size<tuple<_Elements...> >::value.

From-SVN: r122883

1 files changed, 351 insertions, 333 deletions

diff --git a/libstdc++-v3/include/tr1/tuple b/libstdc++-v3/include/tr1/tuple
index 96ba4b82aa6..4e1a2d42f58 100644
--- a/libstdc++-v3/include/tr1/tuple
+++ b/libstdc++-v3/include/tr1/tuple
@@ -1,6 +1,6 @@
 // class template tuple -*- C++ -*-
 
-// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -39,329 +39,348 @@
 
 #pragma GCC system_header
 
-#include <tr1/utility>
-#include <tr1/ref_fwd.h>
-#include <bits/cpp_type_traits.h> // for __enable_if
+#include <utility>
 
 namespace std
 {
 _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 
- // Adds a const reference to a non-reference type.
- template<typename _Tp>
-   struct __add_c_ref
-   { typedef const _Tp& type; };
-
- template<typename _Tp>
-   struct __add_c_ref<_Tp&>
-   { typedef _Tp& type; };
-
- // Adds a reference to a non-reference type.
- template<typename _Tp>
-   struct __add_ref
-   { typedef _Tp& type; };
-
- template<typename _Tp>
-   struct __add_ref<_Tp&>
-   { typedef _Tp& type; };
-
-/**
- * @if maint
- * Contains the actual implementation of the @c tuple template, stored
- * as a recursive inheritance hierarchy from the first element (most
- * derived class) to the last (least derived class). The @c Idx
- * parameter gives the 0-based index of the element stored at this
- * point in the hierarchy; we use it to implement a constant-time
- * get() operation.
- * @endif
- */
- template<int _Idx, typename... _Elements>
-   struct _Tuple_impl; 
-
- /**
-  * @if maint
-  * Zero-element tuple implementation. This is the basis case for the 
-  * inheritance recursion.
-  * @endif maint
-  */
- template<int _Idx>
-   struct _Tuple_impl<_Idx> { };
-
- /**
-  * @if maint
-  * Recursive tuple implementation. Here we store the @c Head element
-  * and derive from a @c Tuple_impl containing the remaining elements
-  * (which contains the @c Tail).
-  * @endif
-  */
- template<int _Idx, typename _Head, typename... _Tail>
-   struct _Tuple_impl<_Idx, _Head, _Tail...>
-     : public _Tuple_impl<_Idx+1, _Tail...>
-   {
-     typedef _Tuple_impl<_Idx+1, _Tail...> _Inherited;
-
-     _Head _M_head;
-
-     _Inherited&       _M_tail()       { return *this; }
-     const _Inherited& _M_tail() const { return *this; }
-
-     _Tuple_impl() : _Inherited(), _M_head() { }
-
-     explicit 
-     _Tuple_impl(typename __add_c_ref<_Head>::type __head,
-                 typename __add_c_ref<_Tail>::type... __tail)
-       : _Inherited(__tail...), _M_head(__head) { }
-
-     template<typename... _UElements>
-       _Tuple_impl(const _Tuple_impl<_Idx, _UElements...>& __in)
-         : _Inherited(__in._M_tail()), _M_head(__in._M_head) { }
-
-     _Tuple_impl(const _Tuple_impl& __in)
-       : _Inherited(__in._M_tail()), _M_head(__in._M_head) { }
+  template<typename _Tp>
+    class reference_wrapper;
+
+  // Adds a const reference to a non-reference type.
+  template<typename _Tp>
+    struct __add_c_ref
+    { typedef const _Tp& type; };
+
+  template<typename _Tp>
+    struct __add_c_ref<_Tp&>
+    { typedef _Tp& type; };
+
+  // Adds a reference to a non-reference type.
+  template<typename _Tp>
+    struct __add_ref
+    { typedef _Tp& type; };
+
+  template<typename _Tp>
+    struct __add_ref<_Tp&>
+    { typedef _Tp& type; };
+
+  /**
+   * @if maint
+   * Contains the actual implementation of the @c tuple template, stored
+   * as a recursive inheritance hierarchy from the first element (most
+   * derived class) to the last (least derived class). The @c Idx
+   * parameter gives the 0-based index of the element stored at this
+   * point in the hierarchy; we use it to implement a constant-time
+   * get() operation.
+   * @endif
+   */
+  template<int _Idx, typename... _Elements>
+    struct _Tuple_impl; 
+
+  /**
+   * @if maint
+   * Zero-element tuple implementation. This is the basis case for the 
+   * inheritance recursion.
+   * @endif maint
+   */
+  template<int _Idx>
+    struct _Tuple_impl<_Idx> { };
+
+  /**
+   * @if maint
+   * Recursive tuple implementation. Here we store the @c Head element
+   * and derive from a @c Tuple_impl containing the remaining elements
+   * (which contains the @c Tail).
+   * @endif
+   */
+  template<int _Idx, typename _Head, typename... _Tail>
+    struct _Tuple_impl<_Idx, _Head, _Tail...>
+    : public _Tuple_impl<_Idx + 1, _Tail...>
+    {
+      typedef _Tuple_impl<_Idx + 1, _Tail...> _Inherited;
+      
+      _Head _M_head;
+      
+      _Inherited&       _M_tail()       { return *this; }
+      const _Inherited& _M_tail() const { return *this; }
+      
+      _Tuple_impl() : _Inherited(), _M_head() { }
+      
+      explicit 
+      _Tuple_impl(typename __add_c_ref<_Head>::type __head,
+		  typename __add_c_ref<_Tail>::type... __tail)
+      : _Inherited(__tail...), _M_head(__head) { }
+
+      template<typename... _UElements>
+      _Tuple_impl(const _Tuple_impl<_Idx, _UElements...>& __in)
+      : _Inherited(__in._M_tail()), _M_head(__in._M_head) { }
+
+      _Tuple_impl(const _Tuple_impl& __in)
+      : _Inherited(__in._M_tail()), _M_head(__in._M_head) { }
      
-     template<typename... _UElements>
-     _Tuple_impl& operator=(const _Tuple_impl<_Idx, _UElements...>& __in)
-     {
-       _M_head = __in._M_head;
-       _M_tail() = __in._M_tail();
-       return *this;
-     }
-
-     _Tuple_impl& operator=(const _Tuple_impl& __in)
-     {
-       _M_head = __in._M_head;
-       _M_tail() = __in._M_tail();
-       return *this;
-     }
-   };
-
- template<typename... _Elements> 
-   class tuple : public _Tuple_impl<0, _Elements...>
-   {
-     typedef _Tuple_impl<0, _Elements...> _Inherited;
-
-   public:
-     tuple() : _Inherited() { }
-
-     explicit
-     tuple(typename __add_c_ref<_Elements>::type... __elements)
-       : _Inherited(__elements...) { }
-
-     template<typename... _UElements>
-       tuple(const tuple<_UElements...>& __in)
-         : _Inherited(__in) { }
-
-     tuple(const tuple& __in)
-         : _Inherited(__in) { }
-
-     template<typename... _UElements>
-       tuple& operator=(const tuple<_UElements...>& __in)
-       {
-         static_cast<_Inherited&>(*this) = __in;
-         return *this;
-       }
-
-     tuple& operator=(const tuple& __in)
-     {
-       static_cast<_Inherited&>(*this) = __in;
-       return *this;
-     }
-   };
-
- template<> class tuple<> { };
-
- // 2-element tuple, with construction and assignment from a pair.
- template<typename _T1, typename _T2>
-   class tuple<_T1, _T2> : public _Tuple_impl<0, _T1, _T2>
-   {
-     typedef _Tuple_impl<0, _T1, _T2> _Inherited;
-
-   public:
-     tuple() : _Inherited() { }
-
-     explicit
-     tuple(typename __add_c_ref<_T1>::type __a1,
-           typename __add_c_ref<_T2>::type __a2)
-       : _Inherited(__a1, __a2) { }
-
-     template<typename _U1, typename _U2>
-       tuple(const tuple<_U1, _U2>& __in)
-         : _Inherited(__in) { }
-
-     tuple(const tuple& __in)
-         : _Inherited(__in) { }
-
-     template<typename _U1, typename _U2>
-       tuple(const pair<_U1, _U2>& __in)
-         : _Inherited(
-             _Tuple_impl<0, 
-                         typename __add_c_ref<_U1>::type,
-                         typename __add_c_ref<_U2>::type>(__in.first, 
-                                                          __in.second))
-       { 
-       }
+      template<typename... _UElements>
+        _Tuple_impl&
+        operator=(const _Tuple_impl<_Idx, _UElements...>& __in)
+        {
+	  _M_head = __in._M_head;
+	  _M_tail() = __in._M_tail();
+	  return *this;
+	}
+
+      _Tuple_impl&
+      operator=(const _Tuple_impl& __in)
+      {
+	_M_head = __in._M_head;
+	_M_tail() = __in._M_tail();
+	return *this;
+      }
+    };
+
+  template<typename... _Elements> 
+    class tuple : public _Tuple_impl<0, _Elements...>
+    {
+      typedef _Tuple_impl<0, _Elements...> _Inherited;
+
+    public:
+      tuple() : _Inherited() { }
+
+      explicit
+      tuple(typename __add_c_ref<_Elements>::type... __elements)
+      : _Inherited(__elements...) { }
+
+      template<typename... _UElements>
+        tuple(const tuple<_UElements...>& __in)
+	: _Inherited(__in) { }
+
+      tuple(const tuple& __in)
+      : _Inherited(__in) { }
+
+      template<typename... _UElements>
+        tuple&
+        operator=(const tuple<_UElements...>& __in)
+        {
+	  static_cast<_Inherited&>(*this) = __in;
+	  return *this;
+	}
+
+      tuple&
+      operator=(const tuple& __in)
+      {
+	static_cast<_Inherited&>(*this) = __in;
+	return *this;
+      }
+    };
+
+  template<> class tuple<> { };
+
+  // 2-element tuple, with construction and assignment from a pair.
+  template<typename _T1, typename _T2>
+    class tuple<_T1, _T2> : public _Tuple_impl<0, _T1, _T2>
+    {
+      typedef _Tuple_impl<0, _T1, _T2> _Inherited;
+
+    public:
+      tuple() : _Inherited() { }
+
+      explicit
+      tuple(typename __add_c_ref<_T1>::type __a1,
+	    typename __add_c_ref<_T2>::type __a2)
+      : _Inherited(__a1, __a2) { }
+
+      template<typename _U1, typename _U2>
+        tuple(const tuple<_U1, _U2>& __in)
+	: _Inherited(__in) { }
+
+      tuple(const tuple& __in)
+      : _Inherited(__in) { }
+
+      template<typename _U1, typename _U2>
+        tuple(const pair<_U1, _U2>& __in)
+	: _Inherited(_Tuple_impl<0, 
+		     typename __add_c_ref<_U1>::type,
+		     typename __add_c_ref<_U2>::type>(__in.first, 
+						      __in.second))
+        { }
   
-     template<typename _U1, typename _U2>
-       tuple& operator=(const tuple<_U1, _U2>& __in)
-       {
-         static_cast<_Inherited&>(*this) = __in;
-         return *this;
-       }
-
-     tuple& operator=(const tuple& __in)
-     {
-       static_cast<_Inherited&>(*this) = __in;
-       return *this;
-     }
-
-     template<typename _U1, typename _U2>
-       tuple& operator=(const pair<_U1, _U2>& __in)
-     {
-       this->_M_head = __in.first;
-       this->_M_tail()._M_head = __in.second;
-       return *this;
-     }
-   };
-
-
- /// Gives the type of the ith element of a given tuple type.
- template<int __i, typename _Tp>
-   struct tuple_element;
-
- /**
-  * @if maint
-  * Recursive case for tuple_element: strip off the first element in
-  * the tuple and retrieve the (i-1)th element of the remaining tuple.
-  * @endif
-  */
- template<int __i, typename _Head, typename... _Tail>
-   struct tuple_element<__i, tuple<_Head, _Tail...> >
-     : tuple_element<__i - 1, tuple<_Tail...> > { };
-
- /**
-  * @if maint
-  * Basis case for tuple_element: The first element is the one we're seeking.
-  * @endif
-  */
- template<typename _Head, typename... _Tail>
-   struct tuple_element<0, tuple<_Head, _Tail...> >
-   {
-     typedef _Head type;
-   };
-
- /// Finds the size of a given tuple type.
- template<typename _Tp>
-   struct tuple_size;
+      template<typename _U1, typename _U2>
+        tuple&
+        operator=(const tuple<_U1, _U2>& __in)
+        {
+	  static_cast<_Inherited&>(*this) = __in;
+	  return *this;
+	}
+
+      tuple&
+      operator=(const tuple& __in)
+      {
+	static_cast<_Inherited&>(*this) = __in;
+	return *this;
+      }
+
+      template<typename _U1, typename _U2>
+        tuple&
+        operator=(const pair<_U1, _U2>& __in)
+        {
+	  this->_M_head = __in.first;
+	  this->_M_tail()._M_head = __in.second;
+	  return *this;
+	}
+    };
+
+  
+  /// Gives the type of the ith element of a given tuple type.
+  template<int __i, typename _Tp>
+    struct tuple_element;
+
+  /**
+   * @if maint
+   * Recursive case for tuple_element: strip off the first element in
+   * the tuple and retrieve the (i-1)th element of the remaining tuple.
+   * @endif
+   */
+  template<int __i, typename _Head, typename... _Tail>
+    struct tuple_element<__i, tuple<_Head, _Tail...> >
+    : tuple_element<__i - 1, tuple<_Tail...> > { };
+
+  /**
+   * @if maint
+   * Basis case for tuple_element: The first element is the one we're seeking.
+   * @endif
+   */
+  template<typename _Head, typename... _Tail>
+    struct tuple_element<0, tuple<_Head, _Tail...> >
+    {
+      typedef _Head type;
+    };
+
+  /// Finds the size of a given tuple type.
+  template<typename _Tp>
+    struct tuple_size;
 
   /// @brief class tuple_size
- template<typename... _Elements>
-   struct tuple_size<tuple<_Elements...> >
-   {
-     static const int value = sizeof...(_Elements);
-   };
-
- // Returns a const reference to the ith element of a tuple.
- // Any const or non-const ref elements are returned with their original type.
- template<int __i, typename _Head, typename... _Tail>
-   inline typename __add_ref<_Head>::type
-     get(_Tuple_impl<__i, _Head, _Tail...>& __t)
-     {
-       return __t._M_head;
-     }
-
- template<int __i, typename _Head, typename... _Tail>
-   inline typename __add_c_ref<_Head>::type
-     get(const _Tuple_impl<__i, _Head, _Tail...>& __t)
-     {
-       return __t._M_head;
-     }
-
- // This class helps construct the various comparison operations on tuples
- template<int __check_equal_size, int __i, int __j, typename _Tp, typename _Up>
-   struct __tuple_compare;
-
- template<int __i, int __j, typename _Tp, typename _Up>
-   struct __tuple_compare<0, __i, __j, _Tp, _Up>
-   {
-     static bool __eq(const _Tp& __t, const _Up& __u)
-     {
-       return get<__i>(__t) == get<__i>(__u) &&
-          __tuple_compare<0, __i+1, __j, _Tp, _Up>::__eq(__t, __u);
-     }
-     static bool __less(const _Tp& __t, const _Up& __u)
-     {
-       return (get<__i>(__t) < get<__i>(__u)) || !(get<__i>(__u) < get<__i>(__t)) &&
-          __tuple_compare<0, __i+1, __j, _Tp, _Up>::__less(__t, __u);
-     }
-   };
-
- template<int __i, typename _Tp, typename _Up>
-   struct __tuple_compare<0, __i, __i, _Tp, _Up>
-   {
-     static bool __eq(const _Tp&, const _Up&)
-     { return true; }
-     static bool __less(const _Tp&, const _Up&)
-     { return false; }
-   };
-
- template<typename... _TElements, typename... _UElements>
- bool
- operator==(const tuple<_TElements...>& __t, const tuple<_UElements...>& __u)
- {
-   typedef tuple<_TElements...> _Tp;
-   typedef tuple<_UElements...> _Up;
-   return __tuple_compare<tuple_size<_Tp>::value - tuple_size<_Tp>::value, 0,
-                          tuple_size<_Tp>::value, _Tp, _Up>::__eq(__t, __u);
- }
-
- template<typename... _TElements, typename... _UElements>
- bool
- operator<(const tuple<_TElements...>& __t, const tuple<_UElements...>& __u)
- {
-   typedef tuple<_TElements...> _Tp;
-   typedef tuple<_UElements...> _Up;
-   return __tuple_compare<tuple_size<_Tp>::value - tuple_size<_Tp>::value, 0,
-                          tuple_size<_Tp>::value, _Tp, _Up>::__less(__t, __u);
- }
-
- template<typename... _TElements, typename... _UElements>
- bool
- operator!=(const tuple<_TElements...>& __t, const tuple<_UElements...>& __u)
- { return !(__t == __u); }
-
- template<typename... _TElements, typename... _UElements>
- bool
- operator>(const tuple<_TElements...>& __t, const tuple<_UElements...>& __u)
- { return __u < __t; }
-
- template<typename... _TElements, typename... _UElements>
- bool
- operator<=(const tuple<_TElements...>& __t, const tuple<_UElements...>& __u)
- { return !(__u < __t); }
-
- template<typename... _TElements, typename... _UElements>
- bool
- operator>=(const tuple<_TElements...>& __t, const tuple<_UElements...>& __u)
- { return !(__t < __u); }
-
- // Helper which adds a reference to a type when given a reference_wrapper
- template<typename _Tp>
-   struct __strip_reference_wrapper
-   {
-       typedef _Tp __type;
-   };
-
- template<typename _Tp>
-   struct __strip_reference_wrapper<reference_wrapper<_Tp> >
-   {
-     typedef _Tp& __type;
-   };
-
- template<typename _Tp>
-   struct __strip_reference_wrapper<const reference_wrapper<_Tp> >
-   {
-       typedef _Tp& __type;
-   };
+  template<typename... _Elements>
+    struct tuple_size<tuple<_Elements...> >
+    {
+      static const int value = sizeof...(_Elements);
+    };
+
+  template<typename... _Elements>
+    const int tuple_size<tuple<_Elements...> >::value;
+
+  // Returns a const reference to the ith element of a tuple.
+  // Any const or non-const ref elements are returned with their original type.
+  template<int __i, typename _Head, typename... _Tail>
+    inline typename __add_ref<_Head>::type
+    get(_Tuple_impl<__i, _Head, _Tail...>& __t)
+    {
+      return __t._M_head;
+    }
+
+  template<int __i, typename _Head, typename... _Tail>
+    inline typename __add_c_ref<_Head>::type
+    get(const _Tuple_impl<__i, _Head, _Tail...>& __t)
+    {
+      return __t._M_head;
+    }
+
+  // This class helps construct the various comparison operations on tuples
+  template<int __check_equal_size, int __i, int __j,
+	   typename _Tp, typename _Up>
+    struct __tuple_compare;
+
+  template<int __i, int __j, typename _Tp, typename _Up>
+    struct __tuple_compare<0, __i, __j, _Tp, _Up>
+    {
+      static bool __eq(const _Tp& __t, const _Up& __u)
+      {
+	return (get<__i>(__t) == get<__i>(__u) &&
+		__tuple_compare<0, __i+1, __j, _Tp, _Up>::__eq(__t, __u));
+      }
+     
+      static bool __less(const _Tp& __t, const _Up& __u)
+      {
+	return ((get<__i>(__t) < get<__i>(__u))
+		|| !(get<__i>(__u) < get<__i>(__t)) &&
+		__tuple_compare<0, __i+1, __j, _Tp, _Up>::__less(__t, __u));
+      }
+    };
+
+  template<int __i, typename _Tp, typename _Up>
+    struct __tuple_compare<0, __i, __i, _Tp, _Up>
+    {
+      static bool __eq(const _Tp&, const _Up&)
+      { return true; }
+     
+      static bool __less(const _Tp&, const _Up&)
+      { return false; }
+    };
+
+  template<typename... _TElements, typename... _UElements>
+    bool
+    operator==(const tuple<_TElements...>& __t,
+	       const tuple<_UElements...>& __u)
+    {
+      typedef tuple<_TElements...> _Tp;
+      typedef tuple<_UElements...> _Up;
+      return (__tuple_compare<tuple_size<_Tp>::value - tuple_size<_Tp>::value,
+	      0, tuple_size<_Tp>::value, _Tp, _Up>::__eq(__t, __u));
+    }
+
+  template<typename... _TElements, typename... _UElements>
+    bool
+    operator<(const tuple<_TElements...>& __t,
+	      const tuple<_UElements...>& __u)
+    {
+      typedef tuple<_TElements...> _Tp;
+      typedef tuple<_UElements...> _Up;
+      return (__tuple_compare<tuple_size<_Tp>::value - tuple_size<_Tp>::value,
+	      0, tuple_size<_Tp>::value, _Tp, _Up>::__less(__t, __u));
+    }
+
+  template<typename... _TElements, typename... _UElements>
+    bool
+    operator!=(const tuple<_TElements...>& __t,
+	       const tuple<_UElements...>& __u)
+    { return !(__t == __u); }
+
+  template<typename... _TElements, typename... _UElements>
+    bool
+    operator>(const tuple<_TElements...>& __t,
+	      const tuple<_UElements...>& __u)
+    { return __u < __t; }
+
+  template<typename... _TElements, typename... _UElements>
+    bool
+    operator<=(const tuple<_TElements...>& __t,
+	       const tuple<_UElements...>& __u)
+    { return !(__u < __t); }
+
+  template<typename... _TElements, typename... _UElements>
+    bool
+    operator>=(const tuple<_TElements...>& __t,
+	       const tuple<_UElements...>& __u)
+    { return !(__t < __u); }
+
+  // Helper which adds a reference to a type when given a reference_wrapper
+  template<typename _Tp>
+    struct __strip_reference_wrapper
+    {
+      typedef _Tp __type;
+    };
+
+  template<typename _Tp>
+    struct __strip_reference_wrapper<reference_wrapper<_Tp> >
+    {
+      typedef _Tp& __type;
+    };
+
+  template<typename _Tp>
+    struct __strip_reference_wrapper<const reference_wrapper<_Tp> >
+    {
+      typedef _Tp& __type;
+    };
 
   template<typename... _Elements>
     inline tuple<typename __strip_reference_wrapper<_Elements>::__type...>
@@ -373,30 +392,29 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
     }
 
   template<typename... _Elements>
-    inline tuple<_Elements&...> tie(_Elements&... __args)
+    inline tuple<_Elements&...>
+    tie(_Elements&... __args)
     {
       return tuple<_Elements&...>(__args...);
     }
 
- // A class (and instance) which can be used in 'tie' when an element
- // of a tuple is not required
- struct swallow_assign
- {
-   template<class T>
-   swallow_assign&
-     operator=(const T&)
-     { return *this; }
- };
-
- // TODO: Put this in some kind of shared file.
- namespace
- {
-   swallow_assign ignore;
- }; // anonymous namespace
+  // A class (and instance) which can be used in 'tie' when an element
+  // of a tuple is not required
+  struct _Swallow_assign
+  {
+    template<class _Tp>
+      _Swallow_assign&
+      operator=(const _Tp&)
+      { return *this; }
+  };
+
+  // TODO: Put this in some kind of shared file.
+  namespace
+  {
+    _Swallow_assign ignore;
+  }; // anonymous namespace
 
 _GLIBCXX_END_NAMESPACE
 }
 
-#include <tr1/functional>
-
 #endif