diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-30 23:46:13 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-30 23:46:13 +0000 |
| commit | f982b10d5ad27588a1a3246356b9932f6eed00bc (patch) | |
| tree | 438e28a46058eb46fa5b0b4737b77828d7db3181 /libstdc++-v3/include/std/tuple | |
| parent | 35e3c1ad01d8061914d3b936cfeb93f219269a6d (diff) | |
| download | ppe42-gcc-f982b10d5ad27588a1a3246356b9932f6eed00bc.tar.gz ppe42-gcc-f982b10d5ad27588a1a3246356b9932f6eed00bc.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174458 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/tuple')
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index a0e9e694dc2..f8ec271c1c5 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -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)) { } |
