This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Re: [v3] libstdc++/40925
- From: Paolo Carlini <paolo dot carlini at oracle dot com>
- To: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>
- Cc: libstdc++ <libstdc++ at gcc dot gnu dot org>
- Date: Fri, 30 Oct 2009 03:32:39 +0100
- Subject: Re: [v3] libstdc++/40925
- References: <4AE9EE0B.70809@oracle.com>
... I also applied this follow-up, to deal correctly with "null
pointers" & move-only types, inspired by:
http://gcc.gnu.org/ml/libstdc++/2008-10/msg00080.html
I also checked of course that it doesn't break again libstdc++/37919.
Tested x86_64-linux.
Paolo.
//////////////////////
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37919>
2009-10-29 Paolo Carlini <paolo.carlini@oracle.com>
Douglas Gregor <doug.gregor@gmail.com>
PR libstdc++/40925 (again)
* include/bits/stl_pair.h (pair<_T1, _T2>::pair(_U1&&, const _T2&),
pair<_T1, _T2>::pair(const _T1&, _U2&&)): Add, to deal correctly
with move-only types in the presence of "null pointers".
* testsuite/20_util/pair/40925.cc: Extend.
Index: include/bits/stl_pair.h
===================================================================
--- include/bits/stl_pair.h (revision 153727)
+++ include/bits/stl_pair.h (working copy)
@@ -88,13 +88,26 @@
: first(__a), second(__b) { }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
- template<class _U1, class _U2>
- pair(_U1&& __x, _U2&& __y, typename
- std::enable_if<std::is_convertible<_U1, _T1>::value
- && std::is_convertible<_U2, _T2>::value>::type* = 0)
+ // DR 811.
+ template<class _U1, class = typename
+ std::enable_if<std::is_convertible<_U1, _T1>::value>::type>
+ pair(_U1&& __x, const _T2& __y)
: first(std::forward<_U1>(__x)),
+ second(__y) { }
+
+ template<class _U2, class = typename
+ std::enable_if<std::is_convertible<_U2, _T2>::value>::type>
+ pair(const _T1& __x, _U2&& __y)
+ : first(__x),
second(std::forward<_U2>(__y)) { }
+ template<class _U1, class _U2, class = typename
+ std::enable_if<std::is_convertible<_U1, _T1>::value
+ && std::is_convertible<_U2, _T2>::value>::type>
+ pair(_U1&& __x, _U2&& __y)
+ : first(std::forward<_U1>(__x)),
+ second(std::forward<_U2>(__y)) { }
+
pair(pair&& __p)
: first(std::move(__p.first)),
second(std::move(__p.second)) { }
Index: testsuite/20_util/pair/40925.cc
===================================================================
--- testsuite/20_util/pair/40925.cc (revision 153727)
+++ testsuite/20_util/pair/40925.cc (working copy)
@@ -28,6 +28,15 @@
X(const X&) = delete;
};
+struct move_only
+{
+ move_only() { }
+ move_only(move_only&&) { }
+
+private:
+ move_only(const move_only&) = delete;
+};
+
// libstdc++/40925
void test01()
{
@@ -43,4 +52,16 @@
std::pair<int X::*, int X::*> p6(mp, 0);
std::pair<int X::*, int X::*> p7(0, mp);
std::pair<int X::*, int X::*> p8(mp, mp);
+
+ std::pair<int*, move_only> p9(0, move_only());
+ std::pair<int X::*, move_only> p10(0, move_only());
+ std::pair<move_only, int*> p11(move_only(), 0);
+ std::pair<move_only, int X::*> p12(move_only(), 0);
+
+ std::pair<int*, move_only> p13(ip, move_only());
+ std::pair<int X::*, move_only> p14(mp, move_only());
+ std::pair<move_only, int*> p15(move_only(), ip);
+ std::pair<move_only, int X::*> p16(move_only(), mp);
+
+ std::pair<move_only, move_only> p17(move_only(), move_only());
}