procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Paolo Carlini 2007-03-13 20:02:59 +00:00 • committed by Paolo Carlini
parent bde6c7a990
commit d265b0b1c2
7 changed files with 321 additions and 464 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,16 @@
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.
2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com> 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
* include/tr1/regex: Add "boilerplate" implementations. * include/tr1/regex: Add "boilerplate" implementations.

1
libstdc++-v3/include/Makefile.am
View file

@ -566,7 +566,6 @@ tr1_headers = \
${tr1_srcdir}/memory \ ${tr1_srcdir}/memory \
${tr1_srcdir}/random \ ${tr1_srcdir}/random \
${tr1_srcdir}/random.tcc \ ${tr1_srcdir}/random.tcc \
${tr1_srcdir}/ref_fwd.h \
${tr1_srcdir}/regex \ ${tr1_srcdir}/regex \
${tr1_srcdir}/stdarg.h \ ${tr1_srcdir}/stdarg.h \
${tr1_srcdir}/stdbool.h \ ${tr1_srcdir}/stdbool.h \

1
libstdc++-v3/include/Makefile.in
View file

@ -796,7 +796,6 @@ tr1_headers = \
${tr1_srcdir}/memory \ ${tr1_srcdir}/memory \
${tr1_srcdir}/random \ ${tr1_srcdir}/random \
${tr1_srcdir}/random.tcc \ ${tr1_srcdir}/random.tcc \
${tr1_srcdir}/ref_fwd.h \
${tr1_srcdir}/regex \ ${tr1_srcdir}/regex \
${tr1_srcdir}/stdarg.h \ ${tr1_srcdir}/stdarg.h \
${tr1_srcdir}/stdbool.h \ ${tr1_srcdir}/stdbool.h \

59
libstdc++-v3/include/tr1/ref_fwd.h
View file

@ -1,59 +0,0 @@
// class template reference_wrapper forwarding header -*- C++ -*-
// Copyright (C) 2004, 2005 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
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
// this file and link it with other files to produce an executable, this
// file does not by itself cause the resulting executable to be covered by
// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
/** @file tr1/ref_fwd.h
* This is an internal header file, included by other library headers.
* You should not attempt to use it directly.
*/
// Douglas Gregor <doug.gregor -at- gmail.com>
#ifndef _TR1_REF_FWD
#define _TR1_REF_FWD
namespace std
{
_GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
template<typename _Tp>
class reference_wrapper;
template<typename _Tp>
reference_wrapper<_Tp>
ref(_Tp& __t);
// Denotes a const reference should be taken to a variable.
template<typename _Tp>
reference_wrapper<const _Tp>
cref(const _Tp& __t);
_GLIBCXX_END_NAMESPACE
}
#endif

594
libstdc++-v3/include/tr1/tuple
View file

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

114
libstdc++-v3/include/tr1/tuple_defs.h
View file

@ -1,114 +0,0 @@
// class template tuple -*- C++ -*-
// Copyright (C) 2004, 2005 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
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
// this file and link it with other files to produce an executable, this
// file does not by itself cause the resulting executable to be covered by
// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
/** @file tr1/tuple_defs.h
* This is an internal header file, included by other library headers.
* You should not attempt to use it directly.
*/
#ifndef _GLIBCXX_REPEAT_HEADER
# define _GLIBCXX_REPEAT_HEADER "tuple_defs.h"
# include "repeat.h"
# undef _GLIBCXX_REPEAT_HEADER
#endif
#ifdef _GLIBCXX_LAST_INCLUDE
// Chris Jefferson <chris@bubblescope.net>
template<_GLIBCXX_TEMPLATE_PARAMS_NULL_CLASS> class tuple;
// 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, _GLIBCXX_TEMPLATE_PARAMS>
typename __add_ref<typename tuple_element<__i, tuple<_GLIBCXX_TEMPLATE_ARGS> >::type>::type
get(tuple<_GLIBCXX_TEMPLATE_ARGS>& __t)
{
return __get_helper<__i, tuple<_GLIBCXX_TEMPLATE_ARGS> >::get_value(__t);
}
template<int __i, _GLIBCXX_TEMPLATE_PARAMS>
typename __add_c_ref<typename tuple_element<__i, tuple<_GLIBCXX_TEMPLATE_ARGS> >::type>::type
get(const tuple<_GLIBCXX_TEMPLATE_ARGS>& __t)
{
return __get_helper<__i, tuple<_GLIBCXX_TEMPLATE_ARGS> >::get_value(__t);
}
template<_GLIBCXX_TEMPLATE_PARAMS, _GLIBCXX_TEMPLATE_PARAMS_U>
bool
operator==(const tuple<_GLIBCXX_TEMPLATE_ARGS>& __t,
const tuple<_GLIBCXX_TEMPLATE_ARGS_U>& __u)
{
typedef tuple<_GLIBCXX_TEMPLATE_ARGS> _Tp;
typedef tuple<_GLIBCXX_TEMPLATE_ARGS_U> _Up;
return __tuple_compare<tuple_size<_Tp>::value - tuple_size<_Tp>::value, 0,
tuple_size<_Tp>::value, _Tp, _Up>::__eq(__t, __u);
}
template<_GLIBCXX_TEMPLATE_PARAMS, _GLIBCXX_TEMPLATE_PARAMS_U>
bool
operator<(const tuple<_GLIBCXX_TEMPLATE_ARGS>& __t,
const tuple<_GLIBCXX_TEMPLATE_ARGS_U>& __u)
{
typedef tuple<_GLIBCXX_TEMPLATE_ARGS> _Tp;
typedef tuple<_GLIBCXX_TEMPLATE_ARGS_U> _Up;
return __tuple_compare<tuple_size<_Tp>::value - tuple_size<_Tp>::value, 0,
tuple_size<_Tp>::value, _Tp, _Up>::__less(__t, __u);
}
template<_GLIBCXX_TEMPLATE_PARAMS, _GLIBCXX_TEMPLATE_PARAMS_U>
bool
operator!=(const tuple<_GLIBCXX_TEMPLATE_ARGS>& __t,
const tuple<_GLIBCXX_TEMPLATE_ARGS_U>& __u)
{ return !(__t == __u); }
template<_GLIBCXX_TEMPLATE_PARAMS, _GLIBCXX_TEMPLATE_PARAMS_U>
bool
operator>(const tuple<_GLIBCXX_TEMPLATE_ARGS>& __t,
const tuple<_GLIBCXX_TEMPLATE_ARGS_U>& __u)
{ return __u < __t; }
template<_GLIBCXX_TEMPLATE_PARAMS, _GLIBCXX_TEMPLATE_PARAMS_U>
bool
operator<=(const tuple<_GLIBCXX_TEMPLATE_ARGS>& __t,
const tuple<_GLIBCXX_TEMPLATE_ARGS_U>& __u)
{ return !(__u < __t); }
template<_GLIBCXX_TEMPLATE_PARAMS, _GLIBCXX_TEMPLATE_PARAMS_U>
bool
operator>=(const tuple<_GLIBCXX_TEMPLATE_ARGS>& __t,
const tuple<_GLIBCXX_TEMPLATE_ARGS_U>& __u)
{ return !(__t < __u); }
template<_GLIBCXX_TEMPLATE_PARAMS_NULL_CLASS>
struct __stripped_tuple_type
{
typedef tuple<_GLIBCXX_TEMPLATE_ARGS_STRIPPED> __type;
};
#endif

3
libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc
View file

@ -1,6 +1,6 @@
// 2004-09-23 Chris Jefferson <chris@bubblescope.net> // 2004-09-23 Chris Jefferson <chris@bubblescope.net>
// Copyright (C) 2004 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 // 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 // software; you can redistribute it and/or modify it under the
@ -21,6 +21,7 @@
// Tuple // Tuple
#include <tr1/tuple> #include <tr1/tuple>
#include <tr1/functional>
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
using namespace std; using namespace std;