From d354c5183bb6a0cbaaa3da2a767813843f71fb50 Mon Sep 17 00:00:00 2001 From: Joel de Guzman Date: Mon, 4 Feb 2013 12:15:02 +0000 Subject: [PATCH] Tweaks for MSVC. MSVC version of map is not yet move enables so it is failing the move test [SVN r82728] --- include/boost/fusion/container/vector/detail/vector_n.hpp | 4 +++- include/boost/fusion/support/pair.hpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/boost/fusion/container/vector/detail/vector_n.hpp b/include/boost/fusion/container/vector/detail/vector_n.hpp index 2da75b77..1354ff41 100644 --- a/include/boost/fusion/container/vector/detail/vector_n.hpp +++ b/include/boost/fusion/container/vector/detail/vector_n.hpp @@ -64,7 +64,9 @@ #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template - 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 >::type* /*dummy*/ = 0 + ) : BOOST_PP_ENUM(N, FUSION_VECTOR_CTOR_ARG_FWD, _) {} #endif diff --git a/include/boost/fusion/support/pair.hpp b/include/boost/fusion/support/pair.hpp index 0c04f379..9c54e524 100644 --- a/include/boost/fusion/support/pair.hpp +++ b/include/boost/fusion/support/pair.hpp @@ -13,6 +13,8 @@ #include #include #include +#include +#include #if defined (BOOST_MSVC) # pragma warning(push)