tuple (_Tuple_impl::_M_head, _M_tail): Mark constexpr.
2011-09-06 Benjamin Kosnik <bkoz@redhat.com> * include/std/tuple (_Tuple_impl::_M_head, _M_tail): Mark constexpr. (tuple(tuple&&)): Same. (tuple(const tuple<_UElements...>& __in)): Same. (tuple(tuple<_UElements...>&& __in)): Same. (tuple_cat(const tuple<_TElements...>&, const tuple<_UElements...>&)): Same. (get): Same. * include/std/array: Consolidate array::data usage. * testsuite/23_containers/array/requirements/constexpr_functions.cc: Remove extra include. * testsuite/20_util/tuple/creation_functions/constexpr.cc: New. * testsuite/20_util/tuple/cons/constexpr-2.cc: Add tests. * testsuite/20_util/tuple/cons/constexpr-3.cc: Same. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust line numbers. From-SVN: r178620
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
7b50d234f6
commit
a7d0c94ef1
|
|
@ -1,3 +1,20 @@
|
|||
2011-09-06 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* include/std/tuple (_Tuple_impl::_M_head, _M_tail): Mark constexpr.
|
||||
(tuple(tuple&&)): Same.
|
||||
(tuple(const tuple<_UElements...>& __in)): Same.
|
||||
(tuple(tuple<_UElements...>&& __in)): Same.
|
||||
(tuple_cat(const tuple<_TElements...>&, const tuple<_UElements...>&)):
|
||||
Same.
|
||||
(get): Same.
|
||||
* include/std/array: Consolidate array::data usage.
|
||||
* testsuite/23_containers/array/requirements/constexpr_functions.cc:
|
||||
Remove extra include.
|
||||
* testsuite/20_util/tuple/creation_functions/constexpr.cc: New.
|
||||
* testsuite/20_util/tuple/cons/constexpr-2.cc: Add tests.
|
||||
* testsuite/20_util/tuple/cons/constexpr-3.cc: Same.
|
||||
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust line numbers.
|
||||
|
||||
2011-09-06 François Dumont <fdumont@gcc.gnu.org>
|
||||
Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
struct array
|
||||
{
|
||||
typedef _Tp value_type;
|
||||
typedef _Tp* pointer;
|
||||
typedef const _Tp* const_pointer;
|
||||
typedef value_type* pointer;
|
||||
typedef const value_type* const_pointer;
|
||||
typedef value_type& reference;
|
||||
typedef const value_type& const_reference;
|
||||
typedef value_type* iterator;
|
||||
|
|
@ -90,19 +90,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
// Iterators.
|
||||
iterator
|
||||
begin() noexcept
|
||||
{ return iterator(std::__addressof(_M_instance[0])); }
|
||||
{ return iterator(data()); }
|
||||
|
||||
const_iterator
|
||||
begin() const noexcept
|
||||
{ return const_iterator(std::__addressof(_M_instance[0])); }
|
||||
{ return const_iterator(data()); }
|
||||
|
||||
iterator
|
||||
end() noexcept
|
||||
{ return iterator(std::__addressof(_M_instance[_Nm])); }
|
||||
{ return iterator(data() + _Nm); }
|
||||
|
||||
const_iterator
|
||||
end() const noexcept
|
||||
{ return const_iterator(std::__addressof(_M_instance[_Nm])); }
|
||||
{ return const_iterator(data() + _Nm); }
|
||||
|
||||
reverse_iterator
|
||||
rbegin() noexcept
|
||||
|
|
@ -195,11 +195,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
back() const
|
||||
{ return _Nm ? *(end() - 1) : *end(); }
|
||||
|
||||
_Tp*
|
||||
pointer
|
||||
data() noexcept
|
||||
{ return std::__addressof(_M_instance[0]); }
|
||||
|
||||
const _Tp*
|
||||
const_pointer
|
||||
data() const noexcept
|
||||
{ return std::__addressof(_M_instance[0]); }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
_Head&
|
||||
_M_head() noexcept { return *this; }
|
||||
|
||||
const _Head&
|
||||
constexpr const _Head&
|
||||
_M_head() const noexcept { return *this; }
|
||||
};
|
||||
|
||||
|
|
@ -189,7 +189,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
_Head&
|
||||
_M_head() noexcept { return _M_head_impl; }
|
||||
|
||||
const _Head&
|
||||
constexpr const _Head&
|
||||
_M_head() const noexcept { return _M_head_impl; }
|
||||
|
||||
_Head _M_head_impl;
|
||||
|
|
@ -248,13 +248,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
_Head&
|
||||
_M_head() noexcept { return _Base::_M_head(); }
|
||||
|
||||
const _Head&
|
||||
constexpr const _Head&
|
||||
_M_head() const noexcept { return _Base::_M_head(); }
|
||||
|
||||
_Inherited&
|
||||
_M_tail() noexcept { return *this; }
|
||||
|
||||
const _Inherited&
|
||||
constexpr const _Inherited&
|
||||
_M_tail() const noexcept { return *this; }
|
||||
|
||||
constexpr _Tuple_impl()
|
||||
|
|
@ -280,7 +280,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
_Base(std::forward<_Head>(__in._M_head())) { }
|
||||
|
||||
template<typename... _UElements>
|
||||
_Tuple_impl(const _Tuple_impl<_Idx, _UElements...>& __in)
|
||||
constexpr _Tuple_impl(const _Tuple_impl<_Idx, _UElements...>& __in)
|
||||
: _Inherited(__in._M_tail()), _Base(__in._M_head()) { }
|
||||
|
||||
template<typename _UHead, typename... _UTails>
|
||||
|
|
@ -409,7 +409,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
|
||||
constexpr tuple(const tuple&) = default;
|
||||
|
||||
tuple(tuple&&) = default;
|
||||
constexpr tuple(tuple&&) = default;
|
||||
|
||||
template<typename... _UElements, typename = typename
|
||||
enable_if<__and_<integral_constant<bool, sizeof...(_UElements)
|
||||
|
|
@ -417,7 +417,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
__all_convertible<__conv_types<const _UElements&...>,
|
||||
__conv_types<_Elements...>>
|
||||
>::value>::type>
|
||||
tuple(const tuple<_UElements...>& __in)
|
||||
constexpr tuple(const tuple<_UElements...>& __in)
|
||||
: _Inherited(static_cast<const _Tuple_impl<0, _UElements...>&>(__in))
|
||||
{ }
|
||||
|
||||
|
|
@ -427,7 +427,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
__all_convertible<__conv_types<_UElements...>,
|
||||
__conv_types<_Elements...>>
|
||||
>::value>::type>
|
||||
tuple(tuple<_UElements...>&& __in)
|
||||
constexpr tuple(tuple<_UElements...>&& __in)
|
||||
: _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { }
|
||||
|
||||
// Allocator-extended constructors.
|
||||
|
|
@ -548,18 +548,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
|
||||
constexpr tuple(const tuple&) = default;
|
||||
|
||||
tuple(tuple&&) = default;
|
||||
constexpr tuple(tuple&&) = default;
|
||||
|
||||
template<typename _U1, typename _U2, typename = typename
|
||||
enable_if<__and_<is_convertible<const _U1&, _T1>,
|
||||
is_convertible<const _U2&, _T2>>::value>::type>
|
||||
tuple(const tuple<_U1, _U2>& __in)
|
||||
constexpr tuple(const tuple<_U1, _U2>& __in)
|
||||
: _Inherited(static_cast<const _Tuple_impl<0, _U1, _U2>&>(__in)) { }
|
||||
|
||||
template<typename _U1, typename _U2, typename = typename
|
||||
enable_if<__and_<is_convertible<_U1, _T1>,
|
||||
is_convertible<_U2, _T2>>::value>::type>
|
||||
tuple(tuple<_U1, _U2>&& __in)
|
||||
constexpr tuple(tuple<_U1, _U2>&& __in)
|
||||
: _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { }
|
||||
|
||||
template<typename _U1, typename _U2, typename = typename
|
||||
|
|
@ -571,7 +571,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
template<typename _U1, typename _U2, typename = typename
|
||||
enable_if<__and_<is_convertible<_U1, _T1>,
|
||||
is_convertible<_U2, _T2>>::value>::type>
|
||||
tuple(pair<_U1, _U2>&& __in)
|
||||
constexpr tuple(pair<_U1, _U2>&& __in)
|
||||
: _Inherited(std::forward<_U1>(__in.first),
|
||||
std::forward<_U2>(__in.second)) { }
|
||||
|
||||
|
|
@ -752,7 +752,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
{ return __t._M_head(); }
|
||||
|
||||
template<std::size_t __i, typename _Head, typename... _Tail>
|
||||
inline typename __add_c_ref<_Head>::type
|
||||
inline constexpr typename __add_c_ref<_Head>::type
|
||||
__get_helper(const _Tuple_impl<__i, _Head, _Tail...>& __t) noexcept
|
||||
{ return __t._M_head(); }
|
||||
|
||||
|
|
@ -767,7 +767,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
{ return __get_helper<__i>(__t); }
|
||||
|
||||
template<std::size_t __i, typename... _Elements>
|
||||
inline typename __add_c_ref<
|
||||
inline constexpr typename __add_c_ref<
|
||||
typename tuple_element<__i, tuple<_Elements...>>::type
|
||||
>::type
|
||||
get(const tuple<_Elements...>& __t) noexcept
|
||||
|
|
@ -789,13 +789,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
template<std::size_t __i, std::size_t __j, typename _Tp, typename _Up>
|
||||
struct __tuple_compare<0, __i, __j, _Tp, _Up>
|
||||
{
|
||||
static bool __eq(const _Tp& __t, const _Up& __u)
|
||||
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)
|
||||
static bool
|
||||
__less(const _Tp& __t, const _Up& __u)
|
||||
{
|
||||
return ((get<__i>(__t) < get<__i>(__u))
|
||||
|| !(get<__i>(__u) < get<__i>(__t)) &&
|
||||
|
|
@ -806,11 +808,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
template<std::size_t __i, typename _Tp, typename _Up>
|
||||
struct __tuple_compare<0, __i, __i, _Tp, _Up>
|
||||
{
|
||||
static bool __eq(const _Tp&, const _Up&)
|
||||
{ return true; }
|
||||
static bool
|
||||
__eq(const _Tp&, const _Up&) { return true; }
|
||||
|
||||
static bool __less(const _Tp&, const _Up&)
|
||||
{ return false; }
|
||||
static bool
|
||||
__less(const _Tp&, const _Up&) { return false; }
|
||||
};
|
||||
|
||||
template<typename... _TElements, typename... _UElements>
|
||||
|
|
@ -899,7 +901,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
|
||||
template<typename... _TElements, std::size_t... _TIdx,
|
||||
typename... _UElements, std::size_t... _UIdx>
|
||||
inline tuple<_TElements..., _UElements...>
|
||||
inline constexpr tuple<_TElements..., _UElements...>
|
||||
__tuple_cat_helper(const tuple<_TElements...>& __t,
|
||||
const __index_holder<_TIdx...>&,
|
||||
const tuple<_UElements...>& __u,
|
||||
|
|
@ -939,7 +941,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
std::forward<_UElements>(get<_UIdx>(__u))...); }
|
||||
|
||||
template<typename... _TElements, typename... _UElements>
|
||||
inline tuple<_TElements..., _UElements...>
|
||||
inline constexpr tuple<_TElements..., _UElements...>
|
||||
tuple_cat(const tuple<_TElements...>& __t, const tuple<_UElements...>& __u)
|
||||
{
|
||||
return __tuple_cat_helper(__t, typename
|
||||
|
|
@ -1032,8 +1034,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
template<class _T1, class _T2>
|
||||
template<typename _Tp, typename... _Args>
|
||||
inline _Tp
|
||||
pair<_T1, _T2>::
|
||||
__cons(tuple<_Args...>&& __tuple)
|
||||
pair<_T1, _T2>::__cons(tuple<_Args...>&& __tuple)
|
||||
{
|
||||
typedef typename _Build_index_tuple<sizeof...(_Args)>::__type
|
||||
_Indexes;
|
||||
|
|
@ -1043,9 +1044,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
template<class _T1, class _T2>
|
||||
template<typename _Tp, typename... _Args, int... _Indexes>
|
||||
inline _Tp
|
||||
pair<_T1, _T2>::
|
||||
__do_cons(tuple<_Args...>&& __tuple,
|
||||
const _Index_tuple<_Indexes...>&)
|
||||
pair<_T1, _T2>::__do_cons(tuple<_Args...>&& __tuple,
|
||||
const _Index_tuple<_Indexes...>&)
|
||||
{ return _Tp(std::forward<_Args>(get<_Indexes>(__tuple))...); }
|
||||
|
||||
_GLIBCXX_END_NAMESPACE_VERSION
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ int main()
|
|||
test2.operator()<tuple_type, std::pair<short, short>>();
|
||||
|
||||
// 07: different-tuple-type conversion constructor
|
||||
// test2.operator()<tuple_type, std::tuple<short, short>>();
|
||||
// test2.operator()<std::tuple<short, short>, tuple_type>();
|
||||
test2.operator()<tuple_type, std::tuple<short, short>>();
|
||||
test2.operator()<std::tuple<short, short>, tuple_type>();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ int main()
|
|||
constexpr tuple_type t8(i5, i6, i7);
|
||||
|
||||
// 06: different-tuple-type conversion constructor
|
||||
// test2.operator()<tuple_type, std::tuple<short, short, short>>();
|
||||
// test2.operator()<std::tuple<short, short, short>, tuple_type>();
|
||||
test2.operator()<tuple_type, std::tuple<short, short, short>>();
|
||||
test2.operator()<std::tuple<short, short, short>, tuple_type>();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,90 @@
|
|||
// { dg-do compile }
|
||||
// { dg-options "-std=gnu++0x" }
|
||||
|
||||
// Copyright (C) 2011 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 3, 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 COPYING3. If not see
|
||||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
// NOTE: This makes use of the fact that we know how moveable
|
||||
// is implemented on pair, and also vector. If the implementation
|
||||
// changes this test may begin to fail.
|
||||
|
||||
#include <tuple>
|
||||
|
||||
bool test __attribute__((unused)) = true;
|
||||
|
||||
|
||||
// make_tuple
|
||||
#if 0
|
||||
void
|
||||
test_make_tuple()
|
||||
{
|
||||
{
|
||||
typedef std::tuple<int, float> tuple_type;
|
||||
constexpr tuple_type p1 = std::make_tuple(22, 22.222);
|
||||
}
|
||||
|
||||
{
|
||||
typedef std::tuple<int, float, int> tuple_type;
|
||||
constexpr tuple_type p1 = std::make_tuple(22, 22.222, 77799);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// get
|
||||
void
|
||||
test_get()
|
||||
{
|
||||
{
|
||||
typedef std::tuple<int, float> tuple_type;
|
||||
constexpr tuple_type t1 { 55, 77.77 };
|
||||
constexpr auto var = std::get<1>(t1);
|
||||
}
|
||||
|
||||
{
|
||||
typedef std::tuple<int, float, int> tuple_type;
|
||||
constexpr tuple_type t1 { 55, 77.77, 99 };
|
||||
constexpr auto var = std::get<2>(t1);
|
||||
}
|
||||
}
|
||||
|
||||
// tuple_cat
|
||||
void
|
||||
test_tuple_cat()
|
||||
{
|
||||
typedef std::tuple<int, float> tuple_type1;
|
||||
typedef std::tuple<int, int, float> tuple_type2;
|
||||
|
||||
constexpr tuple_type1 t1 { 55, 77.77 };
|
||||
constexpr tuple_type2 t2 { 55, 99, 77.77 };
|
||||
constexpr auto cat1 = std::tuple_cat(t1, t2);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
#if 0
|
||||
test_make_tuple();
|
||||
#endif
|
||||
|
||||
test_get();
|
||||
|
||||
test_tuple_cat();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ main()
|
|||
// { dg-warning "note" "" { target *-*-* } 485 }
|
||||
// { dg-warning "note" "" { target *-*-* } 479 }
|
||||
// { dg-warning "note" "" { target *-*-* } 468 }
|
||||
// { dg-warning "note" "" { target *-*-* } 829 }
|
||||
// { dg-warning "note" "" { target *-*-* } 831 }
|
||||
// { dg-warning "note" "" { target *-*-* } 1056 }
|
||||
// { dg-warning "note" "" { target *-*-* } 1050 }
|
||||
// { dg-warning "note" "" { target *-*-* } 342 }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// { dg-do compile }
|
||||
// { dg-options "-std=gnu++0x" }
|
||||
|
||||
// Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
// Copyright (C) 2010, 2011 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
|
||||
|
|
@ -19,7 +19,6 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <array>
|
||||
#include <testsuite_common_types.h>
|
||||
|
||||
namespace __gnu_test
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue