update

[l4.git] / l4 / pkg / libstdc++-v3 / contrib / libstdc++-v3-4.7 / include / debug / multimap.h

diff --git a/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/debug/multimap.h b/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/debug/multimap.h
index e43094f8b4df99df0fe7fbdc3c92c6e30b475af9..2f562178679e1908456f5365a7ddfa261579abbc 100644 (file)
--- a/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/debug/multimap.h
+++ b/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/debug/multimap.h
@@ -200,8 +200,8 @@ namespace __debug
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
       template<typename _Pair, typename = typename
-              std::enable_if<std::is_convertible<_Pair,
-                                                 value_type>::value>::type>
+              std::enable_if<std::is_constructible<value_type,
+                                                   _Pair&&>::value>::type>
         iterator
         insert(_Pair&& __x)
         { return iterator(_Base::insert(std::forward<_Pair>(__x)), this); }
@@ -226,8 +226,8 @@ namespace __debug
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
       template<typename _Pair, typename = typename
-              std::enable_if<std::is_convertible<_Pair,
-                                                 value_type>::value>::type>
+              std::enable_if<std::is_constructible<value_type,
+                                                   _Pair&&>::value>::type>
         iterator
         insert(const_iterator __position, _Pair&& __x)
         {