OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tuple: Restore is_convertible constraint. 

2011-05-31  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* include/std/tuple: Restore is_convertible constraint.
	* testsuite/20_util/tuple/cons/allocate_noncopyable.cc: Remove.

From-SVN: r174458
This commit is contained in:
Jonathan Wakely 2011-05-30 23:46:13 +00:00 committed by Jonathan Wakely
parent 5f1330380a
commit 59d6607d6f
3 changed files with 6 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-31 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/tuple: Restore is_convertible constraint.
* testsuite/20_util/tuple/cons/allocate_noncopyable.cc: Remove.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/49236

2
libstdc++-v3/include/std/tuple
View File

@ -629,7 +629,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: _Inherited(__a1) { }
template<typename _U1, typename = typename
std::enable_if<std::is_constructible<_T1, _U1&&>::value>::type>
std::enable_if<std::is_convertible<_U1, _T1>::value>::type>
explicit
tuple(_U1&& __a1)
: _Inherited(std::forward<_U1>(__a1)) { }

73
libstdc++-v3/testsuite/20_util/tuple/cons/allocate_noncopyable.cc
View File

@ -1,73 +0,0 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
// 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/>.
// 20.4.2.1 [tuple.cnstr] Allocator-extended constructors
#include <memory>
#include <tuple>
struct MyAlloc { };
struct Tag0 { };
struct Tag1 { };
struct Tag2 { };
// A non-copyable and non-movable type
struct Type
{
typedef MyAlloc allocator_type;
explicit Type(Tag0) { }
Type(std::allocator_arg_t, MyAlloc, Tag1) { }
Type(Tag2, MyAlloc) { }
Type(const Type&) = delete;
Type(Type&&) = delete;
Type& operator=(const Type&) = delete;
Type& operator=(Type&&) = delete;
};
void test01()
{
using std::allocator_arg;
using std::tuple;
MyAlloc a;
Tag0 tag0;
Tag1 tag1;
Tag2 tag2;
// N.B. cannot use Tag0 with uses-allocator construction, because
// uses_allocator<Type, MyAlloc> is true but no suitable cosntructor
tuple<Type> t1(tag0);
tuple<Type> t2(allocator_arg, a, tag1);
tuple<Type> t3(allocator_arg, a, tag2);
tuple<Type, Type> t4(allocator_arg, a, tag1, tag2);
tuple<Type, Type, Type> t5(allocator_arg, a, tag2, tag1, tag2);
}
int main()
{
test01();
return 0;
}