2010-01-03 Paolo Carlini <paolo.carlini@oracle.com>

	* include/bits/stl_pair.h (pair<>::pair(_U1&&, const _T2&),
	pair<>::pair(const _T1&, _U2&&), pair<>::pair(_U1&&, _U2&&)):
	Use std::is_constructible instead of std::is_convertible.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155585 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dcc25f3..a4c525c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/bits/stl_pair.h (pair<>::pair(_U1&&, const _T2&),
+       pair<>::pair(const _T1&, _U2&&), pair<>::pair(_U1&&, _U2&&)):
+       Use std::is_constructible instead of std::is_convertible.
+
 2010-01-01  Paolo Carlini  <paolo.carlini@oracle.com>
 
        Revert last change, reinstantiate basic_string and vstring tests.

diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index 4a9fb6b..9d7338b 100644 (file)
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -90,20 +90,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
       // DR 811.
       template<class _U1, class = typename
-              std::enable_if<std::is_convertible<_U1, _T1>::value>::type>
+              std::enable_if<std::is_constructible<_T1, _U1&&>::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>
+              std::enable_if<std::is_constructible<_T2, _U2&&>::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>
+              std::enable_if<std::is_constructible<_T1, _U1&&>::value
+                           && std::is_constructible<_T2, _U2&&>::value>::type>
         pair(_U1&& __x, _U2&& __y)
        : first(std::forward<_U1>(__x)),
          second(std::forward<_U2>(__y)) { }