[Boost-commit] svn:boost r82728 - in trunk/boost/fusion: container/vector/detail support

Subject: [Boost-commit] svn:boost r82728 - in trunk/boost/fusion: container/vector/detail support
From: joel_at_[hidden]
Date: 2013-02-06 20:25:44

Author: djowel
Date: 2013-02-04 07:15:02 EST (Mon, 04 Feb 2013)
New Revision: 82728
URL: http://svn.boost.org/trac/boost/changeset/82728

Log:
Tweaks for MSVC. MSVC version of map is not yet move enables so it is failing the move test
Text files modified: 
   trunk/boost/fusion/container/vector/detail/vector_n.hpp |     4 +++-                                    
   trunk/boost/fusion/support/pair.hpp                     |     2 ++                                      
   2 files changed, 5 insertions(+), 1 deletions(-)

Modified: trunk/boost/fusion/container/vector/detail/vector_n.hpp
==============================================================================
--- trunk/boost/fusion/container/vector/detail/vector_n.hpp	(original)
+++ trunk/boost/fusion/container/vector/detail/vector_n.hpp	2013-02-04 07:15:02 EST (Mon, 04 Feb 2013)
@@ -64,7 +64,9 @@
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         template <BOOST_PP_ENUM_PARAMS(N, typename U)>
-        BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, U, && _))
+        BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, U, && _)
+          , typename boost::enable_if<is_convertible<U0, T0> >::type* /*dummy*/ = 0
+        )
             : BOOST_PP_ENUM(N, FUSION_VECTOR_CTOR_ARG_FWD, _) {}
 #endif
 

Modified: trunk/boost/fusion/support/pair.hpp
==============================================================================
--- trunk/boost/fusion/support/pair.hpp	(original)
+++ trunk/boost/fusion/support/pair.hpp	2013-02-04 07:15:02 EST (Mon, 04 Feb 2013)
@@ -13,6 +13,8 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/config.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_convertible.hpp>
 
 #if defined (BOOST_MSVC)
 #  pragma warning(push)